From 13105a7848dabcfb1e21911cd68ba70bbb86a7bf Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 28 Nov 2022 00:53:28 +0200 Subject: [PATCH 36/36] CI: Build msys2 qt6-installer with meson See osdn #46128 Signed-off-by: Marko Lindqvist --- windows/installer_msys2/Makefile.autotools | 2 +- windows/installer_msys2/Makefile.meson | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/installer_msys2/Makefile.autotools b/windows/installer_msys2/Makefile.autotools index 659e185abd..6feb2c4f12 100644 --- a/windows/installer_msys2/Makefile.autotools +++ b/windows/installer_msys2/Makefile.autotools @@ -116,7 +116,7 @@ snapshot: ci: cd ../.. ; ./autogen.sh --no-configure-run - make -f $(MAKEFILE_NAME) VERSION_REVTYPE="git" CI=yes EXTRA_CONFIG="--enable-gitrev --with-project-definition=../../../bootstrap/snapshot.project CFLAGS=\\\"-Werror $$CFLAGS\\\" CXXFLAGS=\\\"$$CXXFLAGS\\\"" ruledit-installer-qt6 qt6-installer + make -f $(MAKEFILE_NAME) VERSION_REVTYPE="git" CI=yes EXTRA_CONFIG="--enable-gitrev --with-project-definition=../../../bootstrap/snapshot.project CFLAGS=\\\"-Werror $$CFLAGS\\\" CXXFLAGS=\\\"$$CXXFLAGS\\\"" ruledit-installer-qt6 # configure Freeciv diff --git a/windows/installer_msys2/Makefile.meson b/windows/installer_msys2/Makefile.meson index 44b56e8210..280185057c 100644 --- a/windows/installer_msys2/Makefile.meson +++ b/windows/installer_msys2/Makefile.meson @@ -64,7 +64,7 @@ snapshot: make -f $(MAKEFILE_NAME) VERSION_REVTYPE="git" EXTRA_CONFIG="-Dgitrev=true $(EXTRA_CONFIG)" all ci: - make -f $(MAKEFILE_NAME) VERSION_REVTYPE="git" CI=yes EXTRA_CONFIG="-Dgitrev=true -Dsys-tolua-cmd=true $(EXTRA_CONFIG)" gtk3.22-installer sdl2-installer gtk4-installer + make -f $(MAKEFILE_NAME) VERSION_REVTYPE="git" CI=yes EXTRA_CONFIG="-Dgitrev=true -Dsys-tolua-cmd=true $(EXTRA_CONFIG)" gtk3.22-installer sdl2-installer gtk4-installer qt6-installer gtk3.22-installer: make -f $(MAKEFILE_NAME) GUI=gtk3.22 CLIENT=gtk3.22 FCMP=gtk3 installer-common -- 2.35.1