From 22b38d135813ff01daa566b56dbf96f7a64bf9fb Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 23 Mar 2021 20:21:17 +0200 Subject: [PATCH 36/36] CI: Switch OSX build to Qt6 mode See osdn #41840 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 2 +- scripts/ci-build.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3df2fede95..29f5221e37 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,7 +71,7 @@ jobs: sdl2_image \ sdl2_mixer \ sdl2_ttf \ - qt@5 + qt@6 - name: build shell: bash run: ./scripts/ci-build.sh os_x diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index 0adba6f599..9466c417a0 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -39,16 +39,16 @@ ninja install "os_x") # gcc is an alias for clang on OS X -export PATH="/usr/local/opt/gettext/bin:/usr/local/opt/icu4c/bin:$(brew --prefix qt@5)/bin:$PATH" -export CPPFLAGS="-I/usr/local/opt/gettext/include -I/usr/local/opt/icu4c/include -I/usr/local/opt/qt@5/include $CPPFLAGS" -export LDFLAGS="-L/usr/local/opt/gettext/lib -L/usr/local/opt/icu4c/lib -L/usr/local/opt/qt@5/lib" +export PATH="/usr/local/opt/gettext/bin:/usr/local/opt/icu4c/bin:$(brew --prefix qt@6)/bin:$PATH" +export CPPFLAGS="-I/usr/local/opt/gettext/include -I/usr/local/opt/icu4c/include -I/usr/local/opt/qt@6/include $CPPFLAGS" +export LDFLAGS="-L/usr/local/opt/gettext/lib -L/usr/local/opt/icu4c/lib -L/usr/local/opt/qt@6/lib" export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:$PKG_CONFIG_PATH" mkdir build cd build ../autogen.sh --no-configure-run ../configure \ - --enable-sys-lua \ + --enable-sys-lua --with-qt6 \ --enable-client=gtk3.22,sdl2,qt \ --enable-freeciv-manual \ || (let config_exit_status=$? \ -- 2.30.2