godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Mono: Use msbuild instead of nuget.exe for restoring

Browse Source 
- Make GodotTools output directly to the SCons output directory.
- Removed xbuild_fallback from the build system.

(cherry picked from commit b61ffef0ab)
This commit is contained in:
Ignacio Etcheverry
2020-05-09 17:09:49 +02:00
committed by Rémi Verschelde
parent 34132d2f67
commit 683e19306e
4 changed files with 43 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/mono/config.py
View File

@@ -21,11 +21,21 @@ def configure(env):
default_mono_bundles_zlib = platform in ['javascript']
envvars = Variables()
envvars.Add(PathVariable('mono_prefix', '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('copy_mono_root', 'Make a copy of the mono installation directory to bundle with the editor', False))
envvars.Add(BoolVariable('xbuild_fallback', 'If MSBuild is not found, fallback to xbuild', False))
envvars.Add(
PathVariable(
"mono_prefix",
"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(
"copy_mono_root", "Make a copy of the mono installation directory to bundle with the editor", 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))