From 9ff2dd6be1b6b39ef79d0284fd19dcc656d36547 Mon Sep 17 00:00:00 2001 From: TellowKrinkle Date: Tue, 30 Aug 2022 23:47:45 -0500 Subject: [PATCH] GHActions:Windows: Enable multi-isa builds in cmake --- .github/workflows/windows_build_qt.yml | 2 +- .github/workflows/windows_build_wx.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows_build_qt.yml b/.github/workflows/windows_build_qt.yml index 3c70b9d7e8..9eae28af18 100644 --- a/.github/workflows/windows_build_qt.yml +++ b/.github/workflows/windows_build_qt.yml @@ -92,7 +92,7 @@ jobs: shell: cmd run: | call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - cmake . -B build "-DCMAKE_PREFIX_PATH=%cd%\${{ inputs.qt_dir }}" -DQT_BUILD=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -G Ninja + cmake . -B build "-DCMAKE_PREFIX_PATH=%cd%\${{ inputs.qt_dir }}" -DQT_BUILD=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DDISABLE_ADVANCE_SIMD=ON -G Ninja - name: Build PCSX2 shell: cmd diff --git a/.github/workflows/windows_build_wx.yml b/.github/workflows/windows_build_wx.yml index f15cbece1f..8894dcd496 100644 --- a/.github/workflows/windows_build_wx.yml +++ b/.github/workflows/windows_build_wx.yml @@ -78,7 +78,7 @@ jobs: if "${{ inputs.platform }}"=="Win32" (SET vcvars=vcvarsamd64_x86.bat) else (SET vcvars=vcvars64.bat) call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\%vcvars%" echo vcvars=%vcvars%>> %GITHUB_OUTPUT% - cmake . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -G Ninja + cmake . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DDISABLE_ADVANCE_SIMD=ON -G Ninja - name: Build PCSX2 shell: cmd