diff options
| -rw-r--r-- | SConstruct | 4 | ||||
| -rw-r--r-- | tools/windows.py | 5 |
2 files changed, 8 insertions, 1 deletions
@@ -28,7 +28,9 @@ elif ARGUMENTS.get("platform", ""): else: raise ValueError("Could not detect platform automatically, please specify with platform=<platform>") -env = Environment(tools=["default"]) +# Default tools with no platform defaults to gnu toolchain. +# We apply platform specific toolchains via our custom tools. +env = Environment(tools=["default"], PLATFORM="") # Default num_jobs to local cpu count if not user specified. # SCons has a peculiarity where user-specified options won't be overridden diff --git a/tools/windows.py b/tools/windows.py index 16acc28..e64695a 100644 --- a/tools/windows.py +++ b/tools/windows.py @@ -23,7 +23,12 @@ def generate(env): elif env["arch"] == "x86_32": env["TARGET_ARCH"] = "x86" env["is_msvc"] = True + + # MSVC, linker, and archiver. msvc.generate(env) + env.Tool("mslib") + env.Tool("mslink") + env.Append(CPPDEFINES=["TYPED_METHOD_BIND", "NOMINMAX"]) env.Append(CCFLAGS=["/EHsc"]) env.Append(LINKFLAGS=["/WX"]) |