diff options
author | George Marques <george@gmarqu.es> | 2017-07-28 10:40:33 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-28 10:40:33 -0300 |
commit | 260d179d31972b82e1d604174ccf1663343bfa97 (patch) | |
tree | 81f6d78c626a131ab6e24a678b839b4271be2937 | |
parent | e224528710f5ab9e7ad266a18e737b3e6feadf6f (diff) | |
parent | 712122881881f3a9cd675fbaed67c7aa9d57a6bc (diff) |
Merge pull request #9941 from brenttaylor/gd3-msvc-2015-fix
BUGFIX: Check for "VCINSTALLDIR" environment variable
-rw-r--r-- | SConstruct | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index 9783b3eaca..4085f713b7 100644 --- a/SConstruct +++ b/SConstruct @@ -288,7 +288,7 @@ if selected_platform in platform_list: if (env["warnings"] == 'yes'): print("WARNING: warnings=yes is deprecated; assuming warnings=all") - if (os.name == "nt" and os.getenv("VSINSTALLDIR") and (platform_arg == "windows" or platform_arg == "uwp")): # MSVC, needs to stand out of course + if (os.name == "nt" and os.getenv("VCINSTALLDIR") and (platform_arg == "windows" or platform_arg == "uwp")): # MSVC, needs to stand out of course disable_nonessential_warnings = ['/wd4267', '/wd4244', '/wd4305', '/wd4800'] # Truncations, narrowing conversions... if (env["warnings"] == 'extra'): env.Append(CCFLAGS=['/Wall']) # Implies /W4 |