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

Build system: add option for MSVC incremental linking. 

(cherry picked from commit bbafe14970)
This commit is contained in:
ocean (they/them) 2023-08-29 17:56:25 -04:00 committed by Yuri Sizov
parent d3265cf518
commit cd2e003a05
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
methods.py
View File

@ -871,6 +871,9 @@ def generate_vs_project(env, num_jobs, project_name="godot"):
if env["precision"] == "double": if env["precision"] == "double":
common_build_postfix.append("precision=double") common_build_postfix.append("precision=double")
if env["incremental_link"]:
common_build_postfix.append("incremental_link=yes")
result = " ^& ".join(common_build_prefix + [" ".join([commands] + common_build_postfix)]) result = " ^& ".join(common_build_prefix + [" ".join([commands] + common_build_postfix)])
return result return result

6
platform/windows/detect.py
View File

@ -185,6 +185,7 @@ def get_opts():
BoolVariable("use_static_cpp", "Link MinGW/MSVC C++ runtime libraries statically", True), BoolVariable("use_static_cpp", "Link MinGW/MSVC C++ runtime libraries statically", True),
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),
] ]
@ -355,8 +356,9 @@ def configure_msvc(env, vcvars_msvc_config):
else: else:
env.AppendUnique(CCFLAGS=["/MD"]) env.AppendUnique(CCFLAGS=["/MD"])
# MSVC incremental linking is broken and _increases_ link time (GH-77968). # MSVC incremental linking is broken and may _increase_ link time (GH-77968).
env.Append(LINKFLAGS=["/INCREMENTAL:NO"]) if not env["incremental_link"]:
env.Append(LINKFLAGS=["/INCREMENTAL:NO"])
if env["arch"] == "x86_32": if env["arch"] == "x86_32":
env["x86_libtheora_opt_vc"] = True env["x86_libtheora_opt_vc"] = True