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

Merge pull request #66718 from afestini/fix_vs_project_creation 

Fix VS project creation
This commit is contained in:
Rémi Verschelde 2022-10-04 10:27:23 +02:00
parent 9928cdc2e7 5ac75a02e5
commit 9a67c3d519
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
methods.py
View File

@ -742,7 +742,7 @@ def generate_vs_project(env, num_jobs):
PLATFORMS = ["Win32", "x64"] PLATFORMS = ["Win32", "x64"]
PLATFORM_IDS = ["x86_32", "x86_64"] PLATFORM_IDS = ["x86_32", "x86_64"]
CONFIGURATIONS = ["editor", "template_release", "template_debug"] CONFIGURATIONS = ["editor", "template_release", "template_debug"]
DEV_SUFFIX = ["", ".dev"] DEV_SUFFIX = ".dev" if env["dev_build"] else ""
@staticmethod @staticmethod
def for_every_variant(value): def for_every_variant(value):
@ -777,10 +777,9 @@ def generate_vs_project(env, num_jobs):
for platform in ModuleConfigs.PLATFORMS for platform in ModuleConfigs.PLATFORMS
] ]
self.arg_dict["runfile"] += [ self.arg_dict["runfile"] += [
f'bin\\godot.windows.{config}{dev}.{plat_id}{f".{name}" if name else ""}.exe' f'bin\\godot.windows.{config}{ModuleConfigs.DEV_SUFFIX}.{plat_id}{f".{name}" if name else ""}.exe'
for config in ModuleConfigs.CONFIGURATIONS for config in ModuleConfigs.CONFIGURATIONS
for plat_id in ModuleConfigs.PLATFORM_IDS for plat_id in ModuleConfigs.PLATFORM_IDS
for dev in ModuleConfigs.DEV_SUFFIX
] ]
self.arg_dict["cpppaths"] += ModuleConfigs.for_every_variant(env["CPPPATH"] + [includes]) self.arg_dict["cpppaths"] += ModuleConfigs.for_every_variant(env["CPPPATH"] + [includes])
self.arg_dict["cppdefines"] += ModuleConfigs.for_every_variant(env["CPPDEFINES"] + defines) self.arg_dict["cppdefines"] += ModuleConfigs.for_every_variant(env["CPPDEFINES"] + defines)