Enable the copy_mono_root SCons option by default

This closes #41652.
godotengine · Sep 25, 2020 · cfd564b · cfd564b
1 parent 9f8a923
commit cfd564b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/modules/mono/build_scripts/mono_configure.py b/modules/mono/build_scripts/mono_configure.py
@@ -396,9 +396,8 @@ def copy_mono_lib(libname_wo_ext):
             mono_root = subprocess.check_output(["pkg-config", "mono-2", "--variable=prefix"]).decode("utf8").strip()
 
         if tools_enabled:
+            # Only supported for editor builds.
             copy_mono_root_files(env, mono_root)
-        else:
-            print("Ignoring option: 'copy_mono_root'; only available for builds with 'tools' enabled.")
 
 
 def make_template_dir(env, mono_root):

diff --git a/modules/mono/config.py b/modules/mono/config.py
@@ -23,17 +23,17 @@ def configure(env):
     envvars.Add(
         PathVariable(
             "mono_prefix",
-            "Path to the mono installation directory for the target platform and architecture",
+            "Path to the Mono installation directory for the target platform and architecture",
             "",
             PathVariable.PathAccept,
         )
     )
-    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("mono_static", "Statically link Mono", default_mono_static))
+    envvars.Add(BoolVariable("mono_glue", "Build with the Mono glue sources", True))
     envvars.Add(BoolVariable("build_cil", "Build C# solutions", True))
     envvars.Add(
         BoolVariable(
-            "copy_mono_root", "Make a copy of the mono installation directory to bundle with the editor", False
+            "copy_mono_root", "Make a copy of the Mono installation directory to bundle with the editor", True
         )
     )