From 6327ff39b8490a2e5612a79ca02a4da8385ea3fc Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 16 Sep 2026 07:19:56 +0300 Subject: [PATCH 26/26] CI: Build sdl3-client at mac-meson job See RM #2249 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 6 +++--- scripts/ci-build.sh | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f300c26b02..cec01261f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,9 +66,9 @@ jobs: jpeg \ gtk+3 \ gtk4 \ - sdl2_mixer \ - sdl2_image \ - sdl2_ttf \ + sdl3_mixer \ + sdl3_image \ + sdl3_ttf \ qt@6 - name: build shell: bash diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index b8358cc9ac..6538c2dfef 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -91,9 +91,10 @@ mkdir build cd build meson setup .. \ -Ddebug=true \ + -Daudio=sdl3 \ -Dtools=ruledit,manual,ruleup \ -Dsyslua=true \ - -Dclients=gtk3.22,sdl2,gtk4,qt,stub \ + -Dclients=gtk3.22,sdl3,gtk4,qt,stub \ -Dfcmp=gtk3,gtk4,qt,cli \ -Dfollowtag=macos \ -Dprefix=${HOME}/freeciv/mac-meson \ -- 2.53.0