Sara.Sync
/
godot-cpp
mirror of https://github.com/godotengine/godot-cpp
0
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #932 from Faless/build/4.x_msvc_runtime 

[SCons] Link MSVC debug runtime for optimize=none|debug only.
pull/934/head
Rémi Verschelde 2022-11-21 11:38:55 +01:00
parent 17170fe23c edf02f8319
commit 6bebaa36bf
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/targets.py
View File

@ -55,7 +55,7 @@ def generate(env):
env["optimize"] = ARGUMENTS.get("optimize", opt_level)
env["debug_symbols"] = get_cmdline_bool("debug_symbols", env.dev_build)
if "is_msvc" in env and env["is_msvc"]:
if env.get("is_msvc", False):
if env["debug_symbols"]:
env.Append(CCFLAGS=["/Zi", "/FS"])
env.Append(LINKFLAGS=["/DEBUG:FULL"])
@ -66,8 +66,12 @@ def generate(env):
elif env["optimize"] == "size":
env.Append(CCFLAGS=["/O1"])
env.Append(LINKFLAGS=["/OPT:REF"])
elif env["optimize"] == "debug" or env["optimize"] == "none":
env.Append(CCFLAGS=["/Od"])
if env["optimize"] == "debug" or env["optimize"] == "none":
env.Append(CCFLAGS=["/MDd", "/Od"])
else:
env.Append(CCFLAGS=["/MD"])
else:
if env["debug_symbols"]:
if env.dev_build:

4
tools/windows.py
View File

@ -27,10 +27,6 @@ def generate(env):
env.Append(CPPDEFINES=["TYPED_METHOD_BIND", "NOMINMAX"])
env.Append(CCFLAGS=["/EHsc"])
env.Append(LINKFLAGS=["/WX"])
if env["debug_symbols"] or env["target"] == "debug":
env.Append(CCFLAGS=["/MDd"])
else:
env.Append(CCFLAGS=["/MD"])
if env["use_clang_cl"]:
env["CC"] = "clang-cl"