diff options
| -rw-r--r-- | platform/windows/detect.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/platform/windows/detect.py b/platform/windows/detect.py index 705e83dace..2b1ed64f4a 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -339,10 +339,14 @@ def configure_msvc(env, vcvars_msvc_config): ## Compile/link flags - if env["use_static_cpp"]: - env.AppendUnique(CCFLAGS=["/MT"]) + if env["optimize"] in ["debug", "none"]: + # Always use dynamic runtime, static debug CRT breaks thread_local. + env.AppendUnique(CCFLAGS=["/MDd"]) else: - env.AppendUnique(CCFLAGS=["/MD"]) + if env["use_static_cpp"]: + env.AppendUnique(CCFLAGS=["/MT"]) + else: + env.AppendUnique(CCFLAGS=["/MD"]) if env["arch"] == "x86_32": env["x86_libtheora_opt_vc"] = True |