From 33ce6142a8658dcf2b63728cfbe392af53b1a14b Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 16 Sep 2026 07:19:56 +0300 Subject: [PATCH 72/72] 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 1b77d62783..5064fe4227 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,9 +69,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 68506713fb..44a32686f7 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -121,8 +121,9 @@ cd build meson setup .. \ -Dqtver=qt6x \ -Ddebug=true \ + -Daudio=sdl3 \ -Dtools=ruledit,manual,ruleup \ - -Dclients=gtk3.22,sdl2,gtk4,qt,stub,gtk4x \ + -Dclients=gtk3.22,sdl3,gtk4,qt,stub,gtk4x \ -Dfcmp=gtk3,gtk4,qt,cli \ -Dprefix=${HOME}/freeciv/mac-meson \ || (let meson_exit_status=$? \ -- 2.53.0