godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Windows: Link MSVC dynamic debug CRT for debug builds
This commit is contained in:
Rémi Verschelde 2022-12-05 10:14:33 +01:00
parent 8ff2ca35c5 cf9bb5c2c3
commit e82d66f23b
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
platform/windows/detect.py
View File

@ -339,10 +339,14 @@ def configure_msvc(env, vcvars_msvc_config):
## Compile/link flags ## Compile/link flags
if env["use_static_cpp"]: if env["optimize"] in ["debug", "none"]:
env.AppendUnique(CCFLAGS=["/MT"]) # Always use dynamic runtime, static debug CRT breaks thread_local.
env.AppendUnique(CCFLAGS=["/MDd"])
else: else:
env.AppendUnique(CCFLAGS=["/MD"]) if env["use_static_cpp"]:
env.AppendUnique(CCFLAGS=["/MT"])
else:
env.AppendUnique(CCFLAGS=["/MD"])
if env["arch"] == "x86_32": if env["arch"] == "x86_32":
env["x86_libtheora_opt_vc"] = True env["x86_libtheora_opt_vc"] = True