diff --git a/Source/Editor/Cooker/GameCooker.cpp b/Source/Editor/Cooker/GameCooker.cpp index aab9883e7..91a3a5827 100644 --- a/Source/Editor/Cooker/GameCooker.cpp +++ b/Source/Editor/Cooker/GameCooker.cpp @@ -64,7 +64,7 @@ #include "Platform/Mac/MacPlatformTools.h" #include "Engine/Platform/Mac/MacPlatformSettings.h" #endif -#if PLATFORM_TOOLS_MAC +#if PLATFORM_TOOLS_IOS #include "Platform/iOS/iOSPlatformTools.h" #include "Engine/Platform/iOS/iOSPlatformSettings.h" #endif diff --git a/Source/Editor/GUI/PlatformSelector.cs b/Source/Editor/GUI/PlatformSelector.cs index 0b57551e9..4b9c03267 100644 --- a/Source/Editor/GUI/PlatformSelector.cs +++ b/Source/Editor/GUI/PlatformSelector.cs @@ -92,6 +92,7 @@ namespace FlaxEditor.GUI new PlatformData(PlatformType.Switch, icons.SwitchIcon128, "Switch"), new PlatformData(PlatformType.PS5, icons.PS5Icon128, "PlayStation 5"), new PlatformData(PlatformType.Mac, icons.MacOSIcon128, "macOS"), + new PlatformData(PlatformType.iOS, icons.FlaxLogo128, "iOS"), }; const float IconSize = 64.0f; diff --git a/Source/Editor/Modules/ContentDatabaseModule.cs b/Source/Editor/Modules/ContentDatabaseModule.cs index 672de6d28..146ea9dc1 100644 --- a/Source/Editor/Modules/ContentDatabaseModule.cs +++ b/Source/Editor/Modules/ContentDatabaseModule.cs @@ -948,6 +948,7 @@ namespace FlaxEditor.Modules Proxy.Add(new SettingsProxy(typeof(LinuxPlatformSettings), Editor.Instance.Icons.LinuxSettings128)); Proxy.Add(new SettingsProxy(typeof(AndroidPlatformSettings), Editor.Instance.Icons.AndroidSettings128)); Proxy.Add(new SettingsProxy(typeof(MacPlatformSettings), Editor.Instance.Icons.Document128)); + Proxy.Add(new SettingsProxy(typeof(iOSPlatformSettings), Editor.Instance.Icons.Document128)); var typePS4PlatformSettings = TypeUtils.GetManagedType(GameSettings.PS4PlatformSettingsTypename); if (typePS4PlatformSettings != null) diff --git a/Source/Editor/Windows/GameCookerWindow.cs b/Source/Editor/Windows/GameCookerWindow.cs index 88cb1afe4..d80e2d0d8 100644 --- a/Source/Editor/Windows/GameCookerWindow.cs +++ b/Source/Editor/Windows/GameCookerWindow.cs @@ -47,6 +47,7 @@ namespace FlaxEditor.Windows { PlatformType.Switch, new Switch() }, { PlatformType.PS5, new PS5() }, { PlatformType.Mac, new Mac() }, + { PlatformType.iOS, new iOS() }, }; public BuildTabProxy(GameCookerWindow win, PlatformSelector platformSelector) @@ -64,6 +65,7 @@ namespace FlaxEditor.Windows PerPlatformOptions[PlatformType.Switch].Init("Output/Switch", "Switch"); PerPlatformOptions[PlatformType.PS5].Init("Output/PS5", "PS5"); PerPlatformOptions[PlatformType.Mac].Init("Output/Mac", "Mac"); + PerPlatformOptions[PlatformType.iOS].Init("Output/iOS", "iOS"); } [HideInEditor] @@ -133,6 +135,7 @@ namespace FlaxEditor.Windows { case BuildPlatform.MacOSx64: case BuildPlatform.MacOSARM64: + case BuildPlatform.iOSARM64: case BuildPlatform.AndroidARM64: IsSupported = true; break; @@ -244,6 +247,11 @@ namespace FlaxEditor.Windows protected override BuildPlatform BuildPlatform => CPU == Archs.ARM64 ? BuildPlatform.MacOSARM64 : BuildPlatform.MacOSx64; } + class iOS : Platform + { + protected override BuildPlatform BuildPlatform => BuildPlatform.iOSARM64; + } + class Editor : CustomEditor { private PlatformType _platform; @@ -295,6 +303,9 @@ namespace FlaxEditor.Windows case PlatformType.Mac: name = "Mac"; break; + case PlatformType.iOS: + name = "iOS"; + break; default: name = Utilities.Utils.GetPropertyNameUI(_platform.ToString()); break;