diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-03-26 21:15:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-26 21:15:17 +0200 |
| commit | 4a5723f59e0437dc9f83f7116b8fddd12e15c5d0 (patch) | |
| tree | 4b564c7e2244d8ea9131a94bbb9f10c1b7c7d05a /SConstruct | |
| parent | 928cdb4f8a72c2de5751cddd3205c2a3c09e6f6d (diff) | |
| parent | d8d9eea72252e5b667537261ea40fec18cf1f809 (diff) | |
Merge pull request #17760 from eska014/html5-refactor
Refactor HTML5 platform build script
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct index 7a8db10931..63105bfa84 100644 --- a/SConstruct +++ b/SConstruct @@ -62,11 +62,11 @@ custom_tools = ['default'] platform_arg = ARGUMENTS.get("platform", ARGUMENTS.get("p", False)) -if (os.name == "posix"): - pass -elif (os.name == "nt"): - if platform_arg == "android" or platform_arg == "javascript" or ARGUMENTS.get("use_mingw", False): - custom_tools = ['mingw'] +if os.name == "nt" and (platform_arg == "android" or ARGUMENTS.get("use_mingw", False)): + custom_tools = ['mingw'] +elif platform_arg == 'javascript': + # Use generic POSIX build toolchain for Emscripten. + custom_tools = ['cc', 'c++', 'ar', 'link', 'textfile', 'zip'] env_base = Environment(tools=custom_tools) if 'TERM' in os.environ: |