Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #105238 from shana/shana/vsgen-fix

Browse source 
Fix issue where vsproj=yes vsproj_gen_only=no sometimes fails to build
This commit is contained in:
Thaddeus Crews 2025-04-10 16:53:44 -05:00
commit 426fb2e01e
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
methods.py
View file

@ -1274,7 +1274,7 @@ def generate_vs_project(env, original_args, project_name="godot"):
props_template = props_template.replace("%%OUTPUT%%", output)
proplist = [format_key_value(v) for v in list(env["CPPDEFINES"])]
proplist = [format_key_value(j) for j in list(env["CPPDEFINES"])]
proplist += [format_key_value(j) for j in env.get("VSHINT_DEFINES", [])]
props_template = props_template.replace("%%DEFINES%%", ";".join(proplist))
@ -1283,9 +1283,9 @@ def generate_vs_project(env, original_args, project_name="godot"):
proplist += [str(j) for j in get_default_include_paths(env)]
props_template = props_template.replace("%%INCLUDES%%", ";".join(proplist))
proplist = env["CCFLAGS"]
proplist += [x for x in env["CXXFLAGS"] if not x.startswith("$")]
proplist += [str(j) for j in env.get("VSHINT_OPTIONS", [])]
proplist = [env.subst("$CCFLAGS")]
proplist += [env.subst("$CXXFLAGS")]
proplist += [env.subst("$VSHINT_OPTIONS")]
props_template = props_template.replace("%%OPTIONS%%", " ".join(proplist))
# Windows allows us to have spaces in paths, so we need