godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #38963 from neikeq/scons-option-build-cil 

[3.2] Add SCons option to not build C# solutions
This commit is contained in:
Rémi Verschelde 2020-05-22 18:29:52 +02:00 committed by GitHub
parent d5e380117f ce09d0c5e1
commit 73b97e8f05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mono/SCsub
View File

@ -31,7 +31,7 @@ env_mono = conf.Finish()
mono_configure.configure(env, env_mono) 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 # Build Godot API solution
import build_scripts.api_solution_build as api_solution_build import build_scripts.api_solution_build as api_solution_build
api_sln_cmd = api_solution_build.build(env_mono) api_sln_cmd = api_solution_build.build(env_mono)

1
modules/mono/config.py
View File

@ -31,6 +31,7 @@ def configure(env):
) )
envvars.Add(BoolVariable("mono_static", "Statically link mono", default_mono_static)) 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_glue", "Build with the mono glue sources", True))
envvars.Add(BoolVariable("build_cil", "Build C# solutions", True))
envvars.Add( envvars.Add(
BoolVariable( 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", False