summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorHugo Locurcio <hugo.locurcio@hugo.pro>2020-09-25 11:05:28 +0200
committerHugo Locurcio <hugo.locurcio@hugo.pro>2020-09-25 11:08:01 +0200
commitcfd564b385f261d790d52c58be9344adf7d74f0e (patch)
treebdbb19b4cb3207e49a82a8ea123320c88ad4d263 /modules
parent9f8a923b92cc91199dc8a95694242aeda9e6fd49 (diff)
Enable the `copy_mono_root` SCons option by default
This closes #41652.
Diffstat (limited to 'modules')
-rw-r--r--modules/mono/build_scripts/mono_configure.py3
-rw-r--r--modules/mono/config.py8
2 files changed, 5 insertions, 6 deletions
diff --git a/modules/mono/build_scripts/mono_configure.py b/modules/mono/build_scripts/mono_configure.py
index e959312393..6057004166 100644
--- a/modules/mono/build_scripts/mono_configure.py
+++ b/modules/mono/build_scripts/mono_configure.py
@@ -396,9 +396,8 @@ def configure(env, env_mono):
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
index cd659057ef..95459a4779 100644
--- 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
)
)