diff options
| author | yg2f | 2016-10-26 19:07:58 +0200 |
|---|---|---|
| committer | yg2f | 2016-10-26 19:29:30 +0200 |
| commit | f7773d499dcd1d9580616dd1ba03f7382ac44cae (patch) | |
| tree | ebc27e76e87fdcb6eb9f74f22cfc96d854adbde5 /modules/openssl | |
| parent | c67e3a485dedae96b82c3356d5f45ab0509d7759 (diff) | |
| download | godot-f7773d499dcd1d9580616dd1ba03f7382ac44cae.tar.gz godot-f7773d499dcd1d9580616dd1ba03f7382ac44cae.tar.zst godot-f7773d499dcd1d9580616dd1ba03f7382ac44cae.zip | |
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 'modules/openssl')
| -rw-r--r-- | modules/openssl/SCsub | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/openssl/SCsub b/modules/openssl/SCsub index 3cc6f21bd..2327cf483 100644 --- a/modules/openssl/SCsub +++ b/modules/openssl/SCsub @@ -671,7 +671,7 @@ if (env["openssl"] != "system"): # builtin # Workaround for compilation error with GCC/Clang when -Werror is too greedy (GH-4517) import os import methods - if not (os.name=="nt" and methods.msvc_is_detected()): # not Windows and not MSVC + if not (os.name=="nt" and os.getenv("VCINSTALLDIR")): # not Windows and not MSVC env_openssl.Append(CFLAGS = ["-Wno-error=implicit-function-declaration"]) |