summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-05-22 18:29:13 +0200
committerGitHub <noreply@github.com>2020-05-22 18:29:13 +0200
commit2a3f650bf6da47b76e6a2a2dc9e104ad91849e4b (patch)
treecab37234a11a1fb75676ca2b76d159bb37bc0605
parent3be9c74d8b0337d387fb90b8b2c228ebaaae3317 (diff)
parente3a54152e4767e2835369aeaa23578d818903cea (diff)
Merge pull request #38962 from neikeq/4.0-scons-option-build-cil
Add SCons option to not build C# solutions
-rw-r--r--modules/mono/SCsub2
-rw-r--r--modules/mono/config.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/modules/mono/SCsub b/modules/mono/SCsub
index c723b210cb..e8f3174a0a 100644
--- a/modules/mono/SCsub
+++ b/modules/mono/SCsub
@@ -29,7 +29,7 @@ if env_mono["tools"] or env_mono["target"] != "release":
mono_configure.configure(env, env_mono)
-if env_mono["tools"] and env_mono["mono_glue"]:
+if env_mono["tools"] and env_mono["mono_glue"] and env_mono["build_cil"]:
# Build Godot API solution
import build_scripts.api_solution_build as api_solution_build
diff --git a/modules/mono/config.py b/modules/mono/config.py
index d41f3755b5..7980a86cb3 100644
--- a/modules/mono/config.py
+++ b/modules/mono/config.py
@@ -30,6 +30,7 @@ def configure(env):
)
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