Dont use icon on non-SDL macOS window (not implemented)
This commit is contained in:
@@ -654,7 +654,7 @@ Window* Editor::CreateMainWindow()
|
|||||||
PROFILE_MEM(Editor);
|
PROFILE_MEM(Editor);
|
||||||
Window* window = Managed->GetMainWindow();
|
Window* window = Managed->GetMainWindow();
|
||||||
|
|
||||||
#if PLATFORM_LINUX || PLATFORM_MAC
|
#if PLATFORM_LINUX || (PLATFORM_MAC && PLATFORM_SDL)
|
||||||
// Set window icon
|
// Set window icon
|
||||||
const String iconPath = Globals::BinariesFolder / TEXT("Logo.png");
|
const String iconPath = Globals::BinariesFolder / TEXT("Logo.png");
|
||||||
if (FileSystem::FileExists(iconPath))
|
if (FileSystem::FileExists(iconPath))
|
||||||
|
|||||||
@@ -71,7 +71,8 @@ public class FlaxEditor : EngineTarget
|
|||||||
break;
|
break;
|
||||||
case TargetPlatform.Mac:
|
case TargetPlatform.Mac:
|
||||||
options.OutputFolder = Path.Combine(options.WorkingDirectory, "Binaries", "Editor", "Mac", options.Configuration.ToString());
|
options.OutputFolder = Path.Combine(options.WorkingDirectory, "Binaries", "Editor", "Mac", options.Configuration.ToString());
|
||||||
options.DependencyFiles.Add(Path.Combine(Globals.EngineRoot, "Source", "Logo.png"));
|
if (EngineConfiguration.WithSDL(options))
|
||||||
|
options.DependencyFiles.Add(Path.Combine(Globals.EngineRoot, "Source", "Logo.png"));
|
||||||
break;
|
break;
|
||||||
default: throw new InvalidPlatformException(options.Platform.Target, "Not supported Editor platform.");
|
default: throw new InvalidPlatformException(options.Platform.Target, "Not supported Editor platform.");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user