From 7f19fc4ca388782994a41a3b4dbc2a5bdd5509c4 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 18 Apr 2022 08:07:27 +0300 Subject: [PATCH 49/49] Msys2: Build ruledit installer in Qt6 mode Build standalone ruledit installer package in Qt6 mode for win64 Ruledit included in Qt5-client package is built in matching Qt5 mode For win32 ruledit is built in Qt5 mode as our msys2 environment does not contain Qt6 for win32. See osdn #44384 Signed-off-by: Marko Lindqvist --- windows/installer_msys2/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile index 088fe3df70..55d6c88cef 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile @@ -58,7 +58,7 @@ all: all-$(WINARCH) all-win64: gtk3.22-installer sdl2-installer ruledit-installer qt5-installer qt6-installer -all-win32: gtk3.22-installer sdl2-installer ruledit-installer qt5-installer +all-win32: gtk3.22-installer sdl2-installer ruledit-installer-qt5 qt5-installer gtk3.22-installer: make GUI=gtk3.22 CLIENT=gtk3.22 FCMP=gtk3 EXTRA_CONFIG="--disable-ruledit $(EXTRA_CONFIG)" wrap-gtk3.22 @@ -74,7 +74,7 @@ qt5-installer: qt6-installer: make GUI=qt6 CLIENT=qt FCMP=qt EXTRA_CONFIG="--with-qtver=qt6 --with-qt6-includes=/$(ARCHDIR)/include/qt6 --with-qt6-libs=/$(ARCHDIR)/lib $(EXTRA_CONFIG)" MOCCMD="$(QT6_MOCCMD)" wrap-qt6 -ruledit-installer: ruledit-installer-qt5 +ruledit-installer: ruledit-installer-qt6 ruledit-installer-qt5: # EXTRA_CONFIG="$(EXTRA_CONFIG)" *does* make a difference - it unwraps one layer -- 2.35.1