From b42a3504fedd916409be09004c162ea82064f493 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 4 Feb 2023 12:42:17 +0200 Subject: [PATCH 29/29] Msys2 Makefile.meson: Add Qt6-client and -ruledit builds for clang64 See osdn #46577 Signed-off-by: Marko Lindqvist --- windows/installer_msys2/Makefile.meson | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/windows/installer_msys2/Makefile.meson b/windows/installer_msys2/Makefile.meson index f51548dde8..67a88a5d70 100644 --- a/windows/installer_msys2/Makefile.meson +++ b/windows/installer_msys2/Makefile.meson @@ -73,7 +73,7 @@ all-win32: gtk3.22-installer sdl2-installer gtk4-installer qt5-installer ruledit all-win64-10: gtk3.22-installer sdl2-installer gtk4-installer qt6-installer ruledit-installer-qt6 -all-win64+: gtk3.22-install sdl2-install gtk4-install +all-win64+: gtk3.22-install sdl2-install gtk4-install qt6-install ruledit-install-qt6 snapshot: make -f $(MAKEFILE_NAME) VERSION_REVTYPE="git" EXTRA_CONFIG="-Dgitrev=true $(EXTRA_CONFIG)" all @@ -111,6 +111,12 @@ gtk4-install: sdl2-install: make -f $(MAKEFILE_NAME) GUI=sdl2 CLIENT=sdl2 FCMP=gtk4 install-freeciv-sdl2 +qt6-install: + make -f $(MAKEFILE_NAME) GUI=qt6 CLIENT=qt FCMP=qt install-freeciv-qt6 + +ruledit-install-qt6: + make -f $(MAKEFILE_NAME) GUI=qt6 install-ruledit-qt6 + installer-common: install-freeciv-$(GUI) install-env-$(GUI) # Extract Freeciv version $(eval FREECIV_VERSION := $(shell ../../fc_version)) -- 2.39.1