diff options
| author | Eblo <7004497+Eblo@users.noreply.github.com> | 2025-09-10 12:32:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-10 12:32:40 -0400 |
| commit | df18c6deffd68663a11c84d437da419e6433d679 (patch) | |
| tree | 9b6d7aa3d136a60f6d610a746b8546c541c751e9 /.github | |
| parent | 72b48cdae019d149899862d8927a5fc755bed9ea (diff) | |
Revert "Merge develop-rena -> develop (#1258)" (#1269)
This reverts commit 47771de011abced823d9b699fffc8832fedff1b7.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/main.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7b67de5a2..cb5807118 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -130,7 +130,7 @@ jobs: - name: Build 2Ship run: | export PATH="/usr/lib/ccache:/opt/homebrew/opt/ccache/libexec:/usr/local/opt/ccache/libexec:$PATH" - cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" + cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DINCLUDE_MPQ_SUPPORT=1 cmake --build build-cmake --config Release --parallel 10 (cd build-cmake && cpack) @@ -229,7 +229,7 @@ jobs: - name: Build 2Ship run: | export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" - cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_REMOTE_CONTROL=1 + cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_REMOTE_CONTROL=1 -DINCLUDE_MPQ_SUPPORT=1 cmake --build build-cmake --config Release -j3 (cd build-cmake && cpack -G External) @@ -296,7 +296,7 @@ jobs: VCPKG_ROOT: ${{github.workspace}}/vcpkg run: | set $env:PATH="$env:USERPROFILE/.cargo/bin;$env:PATH" - cmake -S . -B build-windows -G Ninja -DCMAKE_MAKE_PROGRAM=ninja -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache + cmake -S . -B build-windows -G Ninja -DCMAKE_MAKE_PROGRAM=ninja -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DINCLUDE_MPQ_SUPPORT=1 cmake --build build-windows --config Release --parallel 10 (cd build-windows && cpack) |