asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #29473 from neikeq/fix-envvars-mono

Browse source 
Mono: Fix SCons options added to the wrong environment
This commit is contained in:
Rémi Verschelde 2019-06-04 22:31:58 +02:00 committed by GitHub
commit 1c950415b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/mono/SCsub
View file

@ -20,11 +20,6 @@ if env['tools']:
'glue/cs_glue_version.gen.h' 'glue/cs_glue_version.gen.h'
) )
vars = Variables()
vars.Add(BoolVariable('mono_glue', 'Build with the mono glue sources', True))
vars.Add(BoolVariable('xbuild_fallback', 'If MSBuild is not found, fallback to xbuild', False))
vars.Update(env_mono)
# Glue sources # Glue sources
if env_mono['mono_glue']: if env_mono['mono_glue']:
env_mono.Append(CPPDEFINES=['MONO_GLUE_ENABLED']) env_mono.Append(CPPDEFINES=['MONO_GLUE_ENABLED'])

8
modules/mono/build_scripts/mono_configure.py
View file

@ -47,14 +47,6 @@ def copy_file(src_dir, dst_dir, name):
def configure(env, env_mono): def configure(env, env_mono):
from SCons.Script import BoolVariable, PathVariable, Variables
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', False))
envvars.Add(BoolVariable('copy_mono_root', 'Make a copy of the mono installation directory to bundle with the editor', False))
envvars.Update(env)
bits = env['bits'] bits = env['bits']
is_android = env['platform'] == 'android' is_android = env['platform'] == 'android'

10
modules/mono/config.py
View file

@ -8,6 +8,16 @@ def configure(env):
env.use_ptrcall = True env.use_ptrcall = True
env.add_module_version_string('mono') env.add_module_version_string('mono')
from SCons.Script import BoolVariable, PathVariable, Variables
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', False))
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.Update(env)
def get_doc_classes(): def get_doc_classes():
return [ return [