Add iOS platform (refactor Mac into shared Apple platform impl)

This commit is contained in:
Wojtek Figat
2023-03-15 20:57:44 +01:00
parent dc29ee180e
commit 0ba261d338
84 changed files with 2806 additions and 1623 deletions

View File

@@ -1,6 +1,6 @@
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
#if PLATFORM_LINUX
#if PLATFORM_LINUX || PLATFORM_MAC || PLATFORM_IOS
#include "Engine/Engine/Engine.h"
#include "Engine/Core/Types/StringBuilder.h"

View File

@@ -1,24 +0,0 @@
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
#if PLATFORM_MAC
#include "Engine/Engine/Engine.h"
#include "Engine/Core/Types/StringBuilder.h"
int main(int argc, char* argv[])
{
// Join the arguments
StringBuilder args;
for (int i = 1; i < argc; i++)
{
args.Append(argv[i]);
if (i + 1 != argc)
args.Append(TEXT(' '));
}
args.Append(TEXT('\0'));
return Engine::Main(*args);
}
#endif

View File

@@ -50,9 +50,6 @@ public class Main : EngineModule
options.CompileEnv.WinRTComponentExtensions = true;
options.CompileEnv.GenerateDocumentation = true;
break;
case TargetPlatform.Linux:
options.SourcePaths.Add(Path.Combine(FolderPath, "Linux"));
break;
case TargetPlatform.PS4:
options.SourcePaths.Add(Path.Combine(Globals.EngineRoot, "Source", "Platforms", "PS4", "Engine", "Main"));
@@ -72,8 +69,10 @@ public class Main : EngineModule
case TargetPlatform.Switch:
options.SourcePaths.Add(Path.Combine(Globals.EngineRoot, "Source", "Platforms", "Switch", "Engine", "Main"));
break;
case TargetPlatform.Linux:
case TargetPlatform.Mac:
options.SourcePaths.Add(Path.Combine(FolderPath, "Mac"));
case TargetPlatform.iOS:
options.SourcePaths.Add(Path.Combine(FolderPath, "Default"));
break;
default: throw new InvalidPlatformException(options.Platform.Target);
}