diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-07-23 13:03:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-23 13:03:40 +0200 |
| commit | 542d8b5d50e9e6f97950e8ed65a328b70914290d (patch) | |
| tree | 46a9afddfa193d09af7064fe08f5f9ac235c65d8 | |
| parent | 5c05388919092a9cecf4a79e0f9fc639af5645a6 (diff) | |
| parent | b0e387a012c4674681428092584c1b07ca8f2d01 (diff) | |
Merge pull request #9684 from eska014/html5-msvc
Fix building HTML5 when cmd.exe is set up for MSVC
| -rw-r--r-- | SConstruct | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index f8b2d82b66..9783b3eaca 100644 --- a/SConstruct +++ b/SConstruct @@ -62,7 +62,7 @@ platform_arg = ARGUMENTS.get("platform", ARGUMENTS.get("p", False)) if (os.name == "posix"): pass elif (os.name == "nt"): - if (os.getenv("VCINSTALLDIR") == None or platform_arg == "android"): + if (os.getenv("VCINSTALLDIR") == None or platform_arg == "android" or platform_arg == "javascript"): custom_tools = ['mingw'] env_base = Environment(tools=custom_tools) @@ -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")): # MSVC, needs to stand out of course + if (os.name == "nt" and os.getenv("VSINSTALLDIR") 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 |