diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4963f4b8..633b7072 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,12 +22,7 @@ jobs: matrix: os: - runner: windows-latest - preset: win32 - cc: cl - cxx: cl - name: Windows-x86 - - runner: windows-latest - preset: win64 + preset: win cc: cl cxx: cl name: Windows-x64 @@ -80,7 +75,7 @@ jobs: - uses: ilammy/msvc-dev-cmd@v1 if: ${{ matrix.os.runner == 'windows-latest' }} with: - arch: ${{ matrix.os.preset }} + arch: win64 - name: Configure CMake env: diff --git a/CMakePresets.json b/CMakePresets.json index 4797cadd..0b5f90e5 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -7,25 +7,7 @@ "binaryDir": "${sourceDir}/builds/${presetName}" }, { - "name": "win32", - "inherits": "defaults", - "generator": "Ninja Multi-Config", - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Windows" - }, - "architecture": { - "strategy": "external", - "value": "x86" - }, - "cacheVariables": { - "VCPKG_TARGET_TRIPLET": "x86-windows-static-md" - }, - "toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" - }, - { - "name": "win64", + "name": "win", "inherits": "defaults", "generator": "Ninja Multi-Config", "condition": { @@ -65,12 +47,8 @@ ], "buildPresets": [ { - "name": "win32", - "configurePreset": "win32" - }, - { - "name": "win64", - "configurePreset": "win64" + "name": "win", + "configurePreset": "win" }, { "name": "mac", @@ -90,16 +68,10 @@ } }, { - "name": "win32", - "inherits": "defaults", - "description": "Testing under Windows x86", - "configurePreset": "win32" - }, - { - "name": "win64", + "name": "win", "inherits": "defaults", "description": "Testing under Windows x64", - "configurePreset": "win64" + "configurePreset": "win" }, { "name": "mac", diff --git a/Descent3/sdlmain.cpp b/Descent3/sdlmain.cpp index 16ef9e7e..4ecbd753 100644 --- a/Descent3/sdlmain.cpp +++ b/Descent3/sdlmain.cpp @@ -454,7 +454,7 @@ int main(int argc, char *argv[]) { #elif defined(WIN32) "Windows", #else - "Linux", + "Linux", #endif #ifdef DEDICATED