Add Editor for Mac impl progress

This commit is contained in:
Wojtek Figat
2021-12-31 17:12:55 +01:00
parent 45117e3445
commit 9b991bcfdf
12 changed files with 29 additions and 0 deletions

View File

@@ -107,6 +107,8 @@ void EditorAnalytics::StartSession()
{ UA_USER_AGENT, 0, "Windows " FLAXENGINE_VERSION_TEXT },
#elif PLATFORM_LINUX
{ UA_USER_AGENT, 0, "Linux " FLAXENGINE_VERSION_TEXT },
#elif PLATFORM_MAC
{ UA_USER_AGENT, 0, "Mac " FLAXENGINE_VERSION_TEXT },
#else
#error "Unknown platform"
#endif

View File

@@ -1,6 +1,7 @@
// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
#include "GameCooker.h"
#include "PlatformTools.h"
#include "FlaxEngine.Gen.h"
#include "Engine/Scripting/MainThreadManagedInvokeAction.h"
#include "Engine/Scripting/ManagedCLR/MTypes.h"

View File

@@ -364,6 +364,8 @@ void ScriptsBuilder::GetBinariesConfiguration(const Char*& target, const Char*&
platform = TEXT("Windows");
#elif PLATFORM_LINUX
platform = TEXT("Linux");
#elif PLATFORM_MAC
platform = TEXT("Mac");
#else
#error "Unknown platform"
#endif

View File

@@ -123,6 +123,16 @@ namespace FlaxEditor.Windows
IsSupported = false;
break;
}
#elif PLATFORM_MAC
switch (BuildPlatform)
{
case BuildPlatform.MacOSx64:
IsSupported = true;
break;
default:
IsSupported = false;
break;
}
#else
#error "Unknown platform."
#endif

View File

@@ -531,6 +531,8 @@ void EngineImpl::InitPaths()
Globals::MonoPath = Globals::StartupFolder / TEXT("Source/Platforms/Editor/Windows/Mono");
#elif PLATFORM_LINUX
Globals::MonoPath = Globals::StartupFolder / TEXT("Source/Platforms/Editor/Linux/Mono");
#elif PLATFORM_MAC
Globals::MonoPath = Globals::StartupFolder / TEXT("Source/Platforms/Editor/Mac/Mono");
#else
#error "Please specify the Mono data location for Editor on this platform."
#endif

View File

@@ -270,6 +270,8 @@ bool ShaderAssetBase::LoadShaderCache(ShaderCacheResult& result)
platformDefine.Name = "PLATFORM_WINDOWS";
#elif PLATFORM_LINUX
platformDefine.Name = "PLATFORM_LINUX";
#elif PLATFORM_MAC
platformDefine.Name = "PLATFORM_MAC";
#else
#error "Unknown platform."
#endif

View File

@@ -53,6 +53,8 @@ public class ShadersCompilation : EngineModule
case TargetPlatform.Linux:
options.PrivateDependencies.Add("ShaderCompilerVulkan");
break;
case TargetPlatform.Mac:
break;
default: throw new InvalidPlatformException(options.Platform.Target);
}

View File

@@ -56,6 +56,7 @@ public class ModelTool : EngineModule
options.PrivateDependencies.Add("UVAtlas");
break;
case TargetPlatform.Linux:
case TargetPlatform.Mac:
break;
default: throw new InvalidPlatformException(options.Platform.Target);
}

View File

@@ -23,6 +23,7 @@ public class FlaxEditor : EngineTarget
{
TargetPlatform.Windows,
TargetPlatform.Linux,
TargetPlatform.Mac,
};
Architectures = new[]
{
@@ -63,6 +64,9 @@ public class FlaxEditor : EngineTarget
options.OutputFolder = Path.Combine(options.WorkingDirectory, "Binaries", "Editor", "Linux", options.Configuration.ToString());
options.DependencyFiles.Add(Path.Combine(Globals.EngineRoot, "Source", "Logo.png"));
break;
case TargetPlatform.Mac:
options.OutputFolder = Path.Combine(options.WorkingDirectory, "Binaries", "Editor", "Mac", options.Configuration.ToString());
break;
default: throw new InvalidPlatformException(options.Platform.Target, "Not supported Editor platform.");
}
}

View File

@@ -35,6 +35,7 @@ public class assimp : DepsModule
options.DelayLoadLibraries.Add("assimp-vc140-md.dll");
break;
case TargetPlatform.Linux:
case TargetPlatform.Mac:
options.OutputFiles.Add(Path.Combine(depsRoot, "libassimp.a"));
options.OutputFiles.Add(Path.Combine(depsRoot, "libIrrXML.a"));
break;

View File

@@ -38,6 +38,7 @@ public class curl : DepsModule
options.OutputFiles.Add("crypt32.lib");
break;
case TargetPlatform.Linux:
case TargetPlatform.Mac:
options.OutputFiles.Add(Path.Combine(depsRoot, "libcurl.a"));
break;
default: throw new InvalidPlatformException(options.Platform.Target);

View File

@@ -42,6 +42,7 @@ namespace Flax.Build
{
TargetPlatform.Windows,
TargetPlatform.Linux,
TargetPlatform.Mac,
};
Architectures = new[]
{