diff options
| author | TechnoPorg <jonah.janzen@gmail.com> | 2022-10-04 19:04:37 -0600 |
|---|---|---|
| committer | TechnoPorg <jonah.janzen@gmail.com> | 2022-10-04 19:10:02 -0600 |
| commit | f124616a5feb9aa7380fde2d4ec1d141ead55281 (patch) | |
| tree | 6367f0b169805a25dad9bef437f09101281d5f3f | |
| parent | 4eb9e3326ebb6e1a523dcb1a6b29294e784193ea (diff) | |
Various enhancements to Visual Studio solution generation.
This adds support for building solutions with dev_mode and/or float=64 enabled.
Additionally, it adds solution generation to the Windows CI to catch future regressions.
| -rw-r--r-- | .github/workflows/windows_builds.yml | 2 | ||||
| -rw-r--r-- | methods.py | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml index b35c811763..507bb21a46 100644 --- a/.github/workflows/windows_builds.yml +++ b/.github/workflows/windows_builds.yml @@ -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) diff --git a/methods.py b/methods.py index bec1b803e9..3a2dd07964 100644 --- a/methods.py +++ b/methods.py @@ -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 |