Merge pull request #66777 from TechnoPorg/msvs-better-options

Enhancements to VS solution generation
This commit is contained in:
Rémi Verschelde 2022-10-05 08:32:17 +02:00
commit fa2d4c0421
2 changed files with 9 additions and 3 deletions

View File

@ -27,7 +27,7 @@ jobs:
target: editor
tests: true
# Skip debug symbols, they're way too big with MSVC.
sconsflags: debug_symbols=no
sconsflags: debug_symbols=no vsproj=yes
bin: "./bin/godot.windows.editor.x86_64.exe"
- name: Template (target=template_release, tools=no)

View File

@ -777,7 +777,7 @@ def generate_vs_project(env, num_jobs):
for platform in ModuleConfigs.PLATFORMS
]
self.arg_dict["runfile"] += [
f'bin\\godot.windows.{config}{ModuleConfigs.DEV_SUFFIX}.{plat_id}{f".{name}" if name else ""}.exe'
f'bin\\godot.windows.{config}{ModuleConfigs.DEV_SUFFIX}{".double" if env["float"] == "64" else ""}.{plat_id}{f".{name}" if name else ""}.exe'
for config in ModuleConfigs.CONFIGURATIONS
for plat_id in ModuleConfigs.PLATFORM_IDS
]
@ -814,12 +814,18 @@ def generate_vs_project(env, num_jobs):
if env["dev_build"]:
common_build_postfix.append("dev_build=yes")
if env["tests"]:
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["float"] == "64":
common_build_postfix.append("float=64")
result = " ^& ".join(common_build_prefix + [" ".join([commands] + common_build_postfix)])
return result