From 696f2a0fb2643995d8292a6d6110f3a09d8e60bb Mon Sep 17 00:00:00 2001 From: Marko Lindqvist <cazfi74@gmail.com> Date: Sun, 11 Jun 2023 17:40:35 +0300 Subject: [PATCH 36/36] Msys2: Build Qt5 based installers for clang32 Msys2 clang32 system does not have Qt6. Build Qt5 based client and ruledit installers there instead of Qt6 ones. See osdn #48209 Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> --- platforms/windows/installer_msys2/Makefile.autotools | 4 ++-- platforms/windows/installer_msys2/Makefile.meson | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/platforms/windows/installer_msys2/Makefile.autotools b/platforms/windows/installer_msys2/Makefile.autotools index b2432d8251..15a5f1525e 100644 --- a/platforms/windows/installer_msys2/Makefile.autotools +++ b/platforms/windows/installer_msys2/Makefile.autotools @@ -106,8 +106,8 @@ all-win32+: make -f $(MAKEFILE_NAME) GUI=gtk3.22 CLIENT=gtk3.22 FCMP=gtk3 EXTRA_CONFIG="--disable-ruledit CFLAGS=\"-Wno-cast-align $$CFLAGS\" $(EXTRA_CONFIG)" install-freeciv-gtk3.22 make -f $(MAKEFILE_NAME) GUI=gtk4 CLIENT=gtk4 FCMP=gtk4 EXTRA_CONFIG="--disable-ruledit CFLAGS=\"-Wno-cast-align $$CFLAGS\" $(EXTRA_CONFIG)" install-freeciv-gtk4 make -f $(MAKEFILE_NAME) GUI=sdl2 CLIENT=sdl2 FCMP=gtk4 EXTRA_CONFIG="--disable-ruledit CFLAGS=\"-Wno-cast-align $$CFLAGS\" $(EXTRA_CONFIG)" install-freeciv-sdl2 - make -f $(MAKEFILE_NAME) GUI=qt6 CLIENT=qt FCMP=qt EXTRA_CONFIG="--with-qtver=qt6 --with-qt6-includes=/$(ARCHDIR)/include/qt6 --with-qt6-libs=/$(ARCHDIR)/lib CFLAGS=\"-Wno-cast-align $$CFLAGS\" $(EXTRA_CONFIG)" MOCCMD="$(QT6_MOCCMD)" install-freeciv-qt6 - make -f $(MAKEFILE_NAME) EXTRA_CONFIG="CFLAGS=\"-Wno-cast-align $$CFLAGS\" $(EXTRA_CONFIG)" MOCCMD="$(QT6_MOCCMD)" install-ruledit-qt6 + make -f $(MAKEFILE_NAME) GUI=qt5 CLIENT=qt FCMP=qt EXTRA_CONFIG="--with-qtver=qt5 --with-qt5-includes=/$(ARCHDIR)/include/qt6 --with-qt6-libs=/$(ARCHDIR)/lib CFLAGS=\"-Wno-cast-align $$CFLAGS\" $(EXTRA_CONFIG)" MOCCMD="$(QT5_MOCCMD)" install-freeciv-qt5 + make -f $(MAKEFILE_NAME) EXTRA_CONFIG="CFLAGS=\"-Wno-cast-align $$CFLAGS\" $(EXTRA_CONFIG)" MOCCMD="$(QT5_MOCCMD)" install-ruledit-qt5 gtk3.22-installer: make -f $(MAKEFILE_NAME) GUI=gtk3.22 CLIENT=gtk3.22 FCMP=gtk3 EXTRA_CONFIG="--disable-ruledit $(EXTRA_CONFIG)" wrap-gtk3.22 diff --git a/platforms/windows/installer_msys2/Makefile.meson b/platforms/windows/installer_msys2/Makefile.meson index ea9780b2b3..dba5fd35f8 100644 --- a/platforms/windows/installer_msys2/Makefile.meson +++ b/platforms/windows/installer_msys2/Makefile.meson @@ -86,7 +86,7 @@ all-win64-10: gtk3.22-installer sdl2-installer gtk4-installer qt6-installer rule all-win64+: gtk3.22-install sdl2-install gtk4-install qt6-install ruledit-install-qt6 -all-win32+: gtk3.22-install sdl2-install gtk4-install qt6-install ruledit-install-qt6 +all-win32+: gtk3.22-install sdl2-install gtk4-install qt5-install ruledit-install-qt5 snapshot: make -f $(MAKEFILE_NAME) VERSION_REVTYPE="git" EXTRA_CONFIG="-Dgitrev=true $(EXTRA_CONFIG)" all @@ -124,11 +124,17 @@ gtk4-install: sdl2-install: make -f $(MAKEFILE_NAME) GUI=sdl2 CLIENT=sdl2 FCMP=gtk4 install-freeciv-sdl2 +qt5-install: + make -f $(MAKEFILE_NAME) GUI=qt5 CLIENT=qt FCMP=qt EXTRA_CONFIG="-Dqtver=qt5 $(EXTRA_CONFIG)" install-freeciv-qt5 + qt6-install: - make -f $(MAKEFILE_NAME) GUI=qt6 CLIENT=qt FCMP=qt install-freeciv-qt6 + make -f $(MAKEFILE_NAME) GUI=qt6 CLIENT=qt FCMP=qt EXTRA_CONFIG="-Dqtver=qt6 $(EXTRA_CONFIG)" install-freeciv-qt6 + +ruledit-install-qt5: + make -f $(MAKEFILE_NAME) GUI=qt5 EXTRA_CONFIG="-Dqtver=qt5 $(EXTRA_CONFIG)" install-ruledit-qt5 ruledit-install-qt6: - make -f $(MAKEFILE_NAME) GUI=qt6 install-ruledit-qt6 + make -f $(MAKEFILE_NAME) GUI=qt6 EXTRA_CONFIG="-Dqtver=qt6 $(EXTRA_CONFIG)" install-ruledit-qt6 installer-common: install-freeciv-$(GUI) install-env-$(GUI) # Extract Freeciv version -- 2.39.2