diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-06-06 19:56:34 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-06-06 19:56:34 -0300 |
| commit | c42651c39e80478594f5fef0c852faaaf498009d (patch) | |
| tree | 97afc32566c9ec2b2a04955c2a99e47f447ea5d4 /SConstruct | |
| parent | 85f4f3927973fa7b106ee274033b1f0180ad4343 (diff) | |
| parent | a1b696aa569da526745927bad1c4203aeab9e2c6 (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/SConstruct b/SConstruct index 5e821751f3..0f9b046e2b 100644 --- a/SConstruct +++ b/SConstruct @@ -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=[] |