Merge pull request #37153 from neikeq/mono_ios-4.0

[master] Mono/C#: Add iOS support

1 files changed, 21 insertions, 5 deletions

diff --git a/modules/mono/config.py b/modules/mono/config.py
index 2ea8a5247d..106ca6e028 100644
--- a/modules/mono/config.py
+++ b/modules/mono/config.py
@@ -1,9 +1,14 @@
+supported_platforms = ["windows", "osx", "linuxbsd", "server", "android", "haiku", "javascript", "iphone"]
+
+
 def can_build(env, platform):
     return True
 
 
 def configure(env):
-    if env["platform"] not in ["windows", "osx", "linuxbsd", "server", "android", "haiku", "javascript"]:
+    platform = env["platform"]
+
+    if platform not in supported_platforms:
         raise RuntimeError("This module does not currently support building for this platform")
 
     env.use_ptrcall = True
@@ -11,6 +16,9 @@ def configure(env):
 
     from SCons.Script import BoolVariable, PathVariable, Variables, Help
 
+    default_mono_static = platform in ["iphone", "javascript"]
+    default_mono_bundles_zlib = platform in ["javascript"]
+
     envvars = Variables()
     envvars.Add(
         PathVariable(
@@ -20,7 +28,7 @@ def configure(env):
             PathVariable.PathAccept,
         )
     )
-    envvars.Add(BoolVariable("mono_static", "Statically link mono", False))
+    envvars.Add(BoolVariable("mono_static", "Statically link mono", default_mono_static))
     envvars.Add(BoolVariable("mono_glue", "Build with the mono glue sources", True))
     envvars.Add(
         BoolVariable(
@@ -28,12 +36,20 @@ def configure(env):
         )
     )
     envvars.Add(BoolVariable("xbuild_fallback", "If MSBuild is not found, fallback to xbuild", False))
+
+    # TODO: It would be great if this could be detected automatically instead
+    envvars.Add(
+        BoolVariable(
+            "mono_bundles_zlib", "Specify if the Mono runtime was built with bundled zlib", default_mono_bundles_zlib
+        )
+    )
+
     envvars.Update(env)
     Help(envvars.GenerateHelpText(env))
 
-    if env["platform"] == "javascript":
-        # Mono wasm already has zlib builtin, so we need this workaround to avoid symbol collisions
-        print("Compiling with Mono wasm disables 'builtin_zlib'")
+    if env["mono_bundles_zlib"]:
+        # Mono may come with zlib bundled for WASM or on newer version when built with MinGW.
+        print("This Mono runtime comes with zlib bundled. Disabling 'builtin_zlib'...")
         env["builtin_zlib"] = False
         thirdparty_zlib_dir = "#thirdparty/zlib/"
         env.Prepend(CPPPATH=[thirdparty_zlib_dir])