Merge pull request #69294 from akien-mga/windows-msvc-link-debug-runtime

Windows: Link MSVC dynamic debug CRT for debug builds
godotengine · Dec 5, 2022 · e82d66f · e82d66f
2 parents 8ff2ca3 + cf9bb5c
commit e82d66f
Showing 1 changed file with 7 additions and 3 deletions.
diff --git 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