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

Merge pull request #87154 from Repiteo/scons/cl-quiet 

SCons: Silence redundant MSVC output
This commit is contained in:
Rémi Verschelde 2024-03-04 13:33:01 +01:00
parent 7be96a55c4 9c674e26a0
commit 3655973e0e
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
platform/windows/detect.py
View File

@ -202,6 +202,7 @@ def get_opts():
BoolVariable("use_asan", "Use address sanitizer (ASAN)", False), BoolVariable("use_asan", "Use address sanitizer (ASAN)", False),
BoolVariable("debug_crt", "Compile with MSVC's debug CRT (/MDd)", False), BoolVariable("debug_crt", "Compile with MSVC's debug CRT (/MDd)", False),
BoolVariable("incremental_link", "Use MSVC incremental linking. May increase or decrease build times.", False), BoolVariable("incremental_link", "Use MSVC incremental linking. May increase or decrease build times.", False),
BoolVariable("silence_msvc", "Silence MSVC's stdout. Decreases output log bloat by roughly half.", True),
("angle_libs", "Path to the ANGLE static libraries", ""), ("angle_libs", "Path to the ANGLE static libraries", ""),
# Direct3D 12 support. # Direct3D 12 support.
( (
@ -392,6 +393,20 @@ def configure_msvc(env: "SConsEnvironment", vcvars_msvc_config):
## Compile/link flags ## Compile/link flags
env["MAXLINELENGTH"] = 8192 # Windows Vista and beyond, so always applicable.
if env["silence_msvc"]:
env.Prepend(CCFLAGS=[">", "NUL"])
env.Prepend(LINKFLAGS=[">", "NUL"])
# "> NUL" fails if using a tempfile, circumvent by removing the argument altogether.
old_esc_func = env["TEMPFILEARGESCFUNC"]
def trim_nul(arg):
return "" if arg in [">", "NUL"] else old_esc_func(arg)
env["TEMPFILEARGESCFUNC"] = trim_nul
if env["debug_crt"]: if env["debug_crt"]:
# Always use dynamic runtime, static debug CRT breaks thread_local. # Always use dynamic runtime, static debug CRT breaks thread_local.
env.AppendUnique(CCFLAGS=["/MDd"]) env.AppendUnique(CCFLAGS=["/MDd"])