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

fix build options configuration for Visual Studio projects 

(cherry picked from commit 6158578087)
This commit is contained in:
Valery Zhuk 2023-07-09 14:19:38 +03:00 committed by Yuri Sizov
parent 5f7685c831
commit 94dfa4eaf9
2 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@ -959,7 +959,7 @@ if selected_platform in platform_list:
print("Error: The `vsproj` option is only usable on Windows with Visual Studio.") print("Error: The `vsproj` option is only usable on Windows with Visual Studio.")
Exit(255) Exit(255)
env["CPPPATH"] = [Dir(path) for path in env["CPPPATH"]] env["CPPPATH"] = [Dir(path) for path in env["CPPPATH"]]
methods.generate_vs_project(env, GetOption("num_jobs"), env["vsproj_name"]) methods.generate_vs_project(env, ARGUMENTS, env["vsproj_name"])
methods.generate_cpp_hint_file("cpp.hint") methods.generate_cpp_hint_file("cpp.hint")
# Check for the existence of headers # Check for the existence of headers

35
methods.py
View File

@ -776,8 +776,18 @@ def add_to_vs_project(env, sources):
env.vs_srcs += [basename + ".cpp"] env.vs_srcs += [basename + ".cpp"]
def generate_vs_project(env, num_jobs, project_name="godot"): def generate_vs_project(env, original_args, project_name="godot"):
batch_file = find_visual_c_batch_file(env) batch_file = find_visual_c_batch_file(env)
filtered_args = original_args.copy()
# Ignore the "vsproj" option to not regenerate the VS project on every build
filtered_args.pop("vsproj", None)
# The "platform" option is ignored because only the Windows platform is currently supported for VS projects
filtered_args.pop("platform", None)
# The "target" option is ignored due to the way how targets configuration is performed for VS projects (there is a separate project configuration for each target)
filtered_args.pop("target", None)
# The "progress" option is ignored as the current compilation progress indication doesn't work in VS
filtered_args.pop("progress", None)
if batch_file: if batch_file:
class ModuleConfigs(Mapping): class ModuleConfigs(Mapping):
@ -853,29 +863,10 @@ def generate_vs_project(env, num_jobs, project_name="godot"):
"platform=windows", "platform=windows",
f"target={configuration_getter}", f"target={configuration_getter}",
"progress=no", "progress=no",
"-j%s" % num_jobs,
] ]
if env["dev_build"]: for arg, value in filtered_args.items():
common_build_postfix.append("dev_build=yes") common_build_postfix.append(f"{arg}={value}")
if env["dev_mode"]:
common_build_postfix.append("dev_mode=yes")
elif env["tests"]:
common_build_postfix.append("tests=yes")
if env["custom_modules"]:
common_build_postfix.append("custom_modules=%s" % env["custom_modules"])
if env["windows_subsystem"] == "console":
common_build_postfix.append("windows_subsystem=console")
if env["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