From 83d223112d255c9842a46dd3e18e1ff17179e58d Mon Sep 17 00:00:00 2001 From: Ethan Lee Date: Tue, 7 Jan 2025 21:27:52 -0500 Subject: [PATCH] CI: Fix Rocky SDL3 builds --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 90e057d1e..227d88b1d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -290,7 +290,7 @@ jobs: - name: Build SDL3 (Debug) run: | cd SDL - cmake -B debug -G Ninja . -DCMAKE_BUILD_TYPE=Debug + cmake -B debug -G Ninja . -DCMAKE_BUILD_TYPE=Debug -DSDL_UNIX_CONSOLE_BUILD=ON ninja -C debug cd .. @@ -338,7 +338,7 @@ jobs: - name: Build SDL3 (Debug) run: | cd SDL - cmake -B debug -G Ninja . -DCMAKE_BUILD_TYPE=Debug + cmake -B debug -G Ninja . -DCMAKE_BUILD_TYPE=Debug -DSDL_UNIX_CONSOLE_BUILD=ON ninja -C debug cd .. @@ -376,7 +376,7 @@ jobs: dnf update -y dnf install -y epel-release crb enable - dnf install -y git cmake ninja-build mingw32-gcc mingw64-gcc xz + dnf install -y git cmake ninja-build mingw32-gcc mingw64-gcc - uses: actions/checkout@v4 with: @@ -384,8 +384,8 @@ jobs: - name: Download SDL run: | - curl -LO https://github.com/libsdl-org/SDL/releases/download/preview-$SDL3_VERSION/SDL3-devel-$SDL3_VERSION-mingw.tar.xz - tar -xvf SDL3-devel-$SDL3_VERSION-mingw.tar.xz -C ${GITHUB_WORKSPACE} + curl -LO https://github.com/libsdl-org/SDL/releases/download/preview-$SDL3_VERSION/SDL3-devel-$SDL3_VERSION-mingw.tar.gz + tar -xvf SDL3-devel-$SDL3_VERSION-mingw.tar.gz -C ${GITHUB_WORKSPACE} - name: CMake configure 32-bit (Release) run: mingw32-cmake -B release-x86 -G Ninja . -DBUILD_SDL3=ON -DCMAKE_BUILD_TYPE=Release -DSDL3_LIBRARIES=${GITHUB_WORKSPACE}/SDL3-$SDL3_VERSION/i686-w64-mingw32/bin/SDL3.dll -DSDL3_INCLUDE_DIRS=${GITHUB_WORKSPACE}/SDL3-$SDL3_VERSION/i686-w64-mingw32/include