From e87dabcf82522f59436898a2c384d048d2bce026 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 6 Oct 2026 03:21:27 +0300 Subject: [PATCH 90/90] CI: Remove SDL2 include/lib path references from mac-meson job See RM #2338 Signed-off-by: Marko Lindqvist --- scripts/ci-build.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index 44a32686f7..7602f74ab0 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -107,13 +107,9 @@ echo "Freeciv server autogame successful!" GETTEXT_PREFIX="$(brew --prefix gettext)" READLINE_PREFIX="$(brew --prefix readline)" ICU4C_PREFIX="$(brew --prefix icu4c)" -SDL2_PREFIX="$(brew --prefix sdl2)" -SDL2_MIXER_PREFIX="$(brew --prefix sdl2_mixer)" -SDL2_TTF_PREFIX="$(brew --prefix sdl2_ttf)" -SDL2_IMAGE_PREFIX="$(brew --prefix sdl2_image)" -export CPPFLAGS="-I${GETTEXT_PREFIX}/include -I${READLINE_PREFIX}/include -I${SDL2_PREFIX}/include -I${SDL2_PREFIX}/include/SDL2 -I${SDL2_MIXER_PREFIX}/include -I${SDL2_TTF_PREFIX}/include -I${SDL2_IMAGE_PREFIX}/include" -export LDFLAGS="-L${GETTEXT_PREFIX}/lib -L${ICU4C_PREFIX}/lib -L${READLINE_PREFIX}/lib -L${SDL2_PREFIX}/lib -L${SDL2_MIXER_PREFIX}/lib -L${SDL2_TTF_PREFIX}/lib -L${SDL2_IMAGE_PREFIX}/lib" +export CPPFLAGS="-I${GETTEXT_PREFIX}/include -I${READLINE_PREFIX}/include" +export LDFLAGS="-L${GETTEXT_PREFIX}/lib -L${ICU4C_PREFIX}/lib -L${READLINE_PREFIX}/lib" export PKG_CONFIG_PATH="${ICU4C_PREFIX}/lib/pkgconfig" mkdir build -- 2.53.0