From b99c8ddda7c15caba38890d543ab7fc17c8df21f Mon Sep 17 00:00:00 2001 From: Ari Vuollet Date: Sat, 4 Apr 2026 16:45:19 +0300 Subject: [PATCH] Fix missing window icon on macOS --- Source/Editor/Editor.cpp | 2 +- Source/Engine/Platform/SDL/SDLWindow.cpp | 4 ++-- Source/FlaxEditor.Build.cs | 1 + Source/Tools/Flax.Build/Deploy/Deployment.Editor.cs | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/Editor/Editor.cpp b/Source/Editor/Editor.cpp index c08648505..18bf43a3a 100644 --- a/Source/Editor/Editor.cpp +++ b/Source/Editor/Editor.cpp @@ -654,7 +654,7 @@ Window* Editor::CreateMainWindow() PROFILE_MEM(Editor); Window* window = Managed->GetMainWindow(); -#if PLATFORM_LINUX +#if PLATFORM_LINUX || PLATFORM_MAC // Set window icon const String iconPath = Globals::BinariesFolder / TEXT("Logo.png"); if (FileSystem::FileExists(iconPath)) diff --git a/Source/Engine/Platform/SDL/SDLWindow.cpp b/Source/Engine/Platform/SDL/SDLWindow.cpp index 9d46e45ac..07983ae3c 100644 --- a/Source/Engine/Platform/SDL/SDLWindow.cpp +++ b/Source/Engine/Platform/SDL/SDLWindow.cpp @@ -18,7 +18,7 @@ #include "Engine/Input/Mouse.h" #include "Engine/Platform/FileSystem.h" #include "Engine/Platform/WindowsManager.h" -#if PLATFORM_LINUX +#if PLATFORM_LINUX || PLATFORM_MAC #define COMPILE_WITH_TEXTURE_TOOL 1 // FIXME #include "Engine/Tools/TextureTool/TextureTool.h" #endif @@ -243,7 +243,7 @@ SDLWindow::SDLWindow(const CreateWindowSettings& settings) SDL_StartTextInput(_window); #endif -#if PLATFORM_LINUX && COMPILE_WITH_TEXTURE_TOOL +#if (PLATFORM_LINUX || PLATFORM_MAC) && COMPILE_WITH_TEXTURE_TOOL // Ensure windows other than the main window have some kind of icon static SDL_Surface* surface = nullptr; static Array colorData; diff --git a/Source/FlaxEditor.Build.cs b/Source/FlaxEditor.Build.cs index 500a211dc..a67136ce8 100644 --- a/Source/FlaxEditor.Build.cs +++ b/Source/FlaxEditor.Build.cs @@ -71,6 +71,7 @@ public class FlaxEditor : EngineTarget break; case TargetPlatform.Mac: options.OutputFolder = Path.Combine(options.WorkingDirectory, "Binaries", "Editor", "Mac", options.Configuration.ToString()); + options.DependencyFiles.Add(Path.Combine(Globals.EngineRoot, "Source", "Logo.png")); break; default: throw new InvalidPlatformException(options.Platform.Target, "Not supported Editor platform."); } diff --git a/Source/Tools/Flax.Build/Deploy/Deployment.Editor.cs b/Source/Tools/Flax.Build/Deploy/Deployment.Editor.cs index ef5f959c8..b3ff862bb 100644 --- a/Source/Tools/Flax.Build/Deploy/Deployment.Editor.cs +++ b/Source/Tools/Flax.Build/Deploy/Deployment.Editor.cs @@ -348,6 +348,7 @@ namespace Flax.Deploy DeployFile(src, dst, "MoltenVK_icd.json"); DeployFiles(src, dst, "*.dll"); DeployFiles(src, dst, "*.dylib"); + DeployFile(src, dst, "Logo.png"); // Optimize package size Utilities.Run("strip", "FlaxEditor", null, dst, Utilities.RunOptions.None);