Merge branch 'feature/xcode-maccatalyst-support-options' into 'main'

Feature: add options to enable/disable support for MacCatalyst See merge request Sharpmake/sharpmake!391
ubisoft · May 11, 2023 · 8235431 · 8235431
2 parents 30b5dd7 + 8a87bdb
commit 8235431
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 4 deletions.
diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/BaseApplePlatform.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/BaseApplePlatform.cs
@@ -863,6 +863,9 @@ public virtual void SelectCompilerOptions(IGenerationContext context)
             options["SpecificSimulatorLibraryPaths"] = XCodeUtil.XCodeFormatList(specificSimulatorLibraryPaths, 4);
 
             options["WarningOptions"] = FileGeneratorUtilities.RemoveLineTag;
+
+            options["SupportsMaccatalyst"] = FileGeneratorUtilities.RemoveLineTag;
+            options["SupportsMacDesignedForIphoneIpad"] = FileGeneratorUtilities.RemoveLineTag;
         }
 
         public virtual void SelectPrecompiledHeaderOptions(IGenerationContext context)

diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/MacCatalystPlatform.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/MacCatalystPlatform.cs
@@ -77,8 +77,14 @@ public override void SelectCompilerOptions(IGenerationContext context)
                     cmdLineOptions["IPhoneOSDeploymentTarget"] = FileGeneratorUtilities.RemoveLineTag;
                 }
 
-                options["SupportsMaccatalyst"] = "YES";
-                options["SupportsMacDesignedForIphoneIpad"] = "YES";
+                 context.SelectOptionWithFallback(
+                    () => options["SupportsMaccatalyst"] = "YES",
+                    Options.Option(Options.XCode.Compiler.SupportsMaccatalyst.Disable, () => options["SupportsMaccatalyst"] = "NO")
+                );
+                context.SelectOptionWithFallback(
+                    () => options["SupportsMacDesignedForIphoneIpad"] = "YES",
+                    Options.Option(Options.XCode.Compiler.SupportsMacDesignedForIphoneIpad.Disable, () => options["SupportsMacDesignedForIphoneIpad"] = "NO")
+                );
             }
 
             public override void SelectLinkerOptions(IGenerationContext context)

diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/iOsPlatform.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/iOsPlatform.cs
@@ -77,8 +77,16 @@ public override void SelectCompilerOptions(IGenerationContext context)
                     cmdLineOptions["IPhoneOSDeploymentTarget"] = FileGeneratorUtilities.RemoveLineTag;
                 }
 
-                options["SupportsMaccatalyst"] = "NO";
-                options["SupportsMacDesignedForIphoneIpad"] = "NO";
+                context.SelectOptionWithFallback(
+                    () => options["SupportsMaccatalyst"] = FileGeneratorUtilities.RemoveLineTag,
+                    Options.Option(Options.XCode.Compiler.SupportsMaccatalyst.Disable, () => options["SupportsMaccatalyst"] = "NO"),
+                    Options.Option(Options.XCode.Compiler.SupportsMaccatalyst.Enable, () => options["SupportsMaccatalyst"] = "YES")
+                );
+                context.SelectOptionWithFallback(
+                    () => options["SupportsMacDesignedForIphoneIpad"] = FileGeneratorUtilities.RemoveLineTag,
+                    Options.Option(Options.XCode.Compiler.SupportsMacDesignedForIphoneIpad.Disable, () => options["SupportsMacDesignedForIphoneIpad"] = "NO"),
+                    Options.Option(Options.XCode.Compiler.SupportsMacDesignedForIphoneIpad.Enable, () => options["SupportsMacDesignedForIphoneIpad"] = "YES")
+                );
             }
 
             public override void SelectLinkerOptions(IGenerationContext context)

diff --git a/Sharpmake/Options.XCode.cs b/Sharpmake/Options.XCode.cs
@@ -635,6 +635,18 @@ public enum TreatWarningsAsErrors
                     [Default]
                     Disable
                 }
+
+                public enum SupportsMaccatalyst
+                {
+                    Enable,
+                    Disable
+                }
+
+                public enum SupportsMacDesignedForIphoneIpad
+                {
+                    Enable,
+                    Disable
+                }
             }
 
             public static class Linker

diff --git a/samples/XCodeProjects/XCodeProjects.CommonProject.sharpmake.cs b/samples/XCodeProjects/XCodeProjects.CommonProject.sharpmake.cs
@@ -130,6 +130,7 @@ public virtual void ConfigureIOS(Configuration conf, CommonTarget target)
         {
             conf.LibraryPaths.Add(Path.Combine(Globals.LibrariesDirectory, "iOS"));
             conf.Options.Add(Options.XCode.Compiler.TargetedDeviceFamily.IosAndIpad);
+            conf.Options.Add(Options.XCode.Compiler.SupportsMacDesignedForIphoneIpad.Enable);
             conf.Options.Add(new Sharpmake.Options.XCode.Compiler.SystemFrameworks("UIKit"));
         }