diff options
| author | yg2f <yoann@terminajones.com> | 2016-10-26 19:07:58 +0200 |
|---|---|---|
| committer | yg2f <yoann@terminajones.com> | 2016-10-26 19:29:30 +0200 |
| commit | f7773d499dcd1d9580616dd1ba03f7382ac44cae (patch) | |
| tree | ebc27e76e87fdcb6eb9f74f22cfc96d854adbde5 /SConstruct | |
| parent | c67e3a485dedae96b82c3356d5f45ab0509d7759 (diff) | |
fix bug introduced by #6501
( @Akien : this PR is for current HEAD only, not to be cherry-picked for 2.1.1 )
this is manual revertion of #6501 which introduced a bug that prevented
scons from detecting Mingw under Windows when MSVC was installed.
(thanks to @vnen for finding this)
AND
it fixes the actual bug that prevented scons from detecting MSVC standalone
compiler ( a confusions between ``VSINSTALLDIR`` and ``VCINSTALLDIR`` )
The freeware Standalone MSVC C++ Build Tools are available here :
http://landinghub.visualstudio.com/visual-cpp-build-tools
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index 72de2e2004..365463ebad 100644 --- a/SConstruct +++ b/SConstruct @@ -61,7 +61,7 @@ platform_arg = ARGUMENTS.get("platform", ARGUMENTS.get("p", False)) if (os.name=="posix"): pass elif (os.name=="nt"): - if (not methods.msvc_is_detected() or platform_arg=="android"): + if ( os.getenv("VCINSTALLDIR")==None or platform_arg=="android"): custom_tools=['mingw'] env_base=Environment(tools=custom_tools); |