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

Merge pull request #5065 from RandomShaper/keep-default-build-env 

Keep the default environment variables as set by SCons
This commit is contained in:
Rémi Verschelde 2016-06-06 23:27:08 +02:00
parent 1ce0ccac29 ad0af9d273
commit 7dd00d3398
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SConstruct
View File

@ -63,14 +63,9 @@ elif (os.name=="nt"):
if (os.getenv("VSINSTALLDIR")==None or platform_arg=="android"):
custom_tools=['mingw']
env_base=Environment(
tools=custom_tools,
ENV={
'PATH' : os.getenv('PATH'),
'PKG_CONFIG_PATH' : os.getenv('PKG_CONFIG_PATH')
});
#env_base=Environment(tools=custom_tools);
env_base=Environment(tools=custom_tools);
env_base.AppendENVPath('PATH', os.getenv('PATH'))
env_base.AppendENVPath('PKG_CONFIG_PATH', os.getenv('PKG_CONFIG_PATH'))
env_base.global_defaults=global_defaults
env_base.android_maven_repos=[]
env_base.android_dependencies=[]