From f8b1a51440ae75a1da4b432e0e0787b1d01cc5f4 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sat, 16 Jul 2022 16:42:08 +0300
Subject: [PATCH 49/49] meson-winbuild.sh: Add Qt6-client support
Crosser-2.4 (currently development version)
required to actually build the client.
See osdn #45117
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
windows/installer_cross/meson-winbuild.sh | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/windows/installer_cross/meson-winbuild.sh b/windows/installer_cross/meson-winbuild.sh
index f601cf829b..c5b3910596 100755
--- a/windows/installer_cross/meson-winbuild.sh
+++ b/windows/installer_cross/meson-winbuild.sh
@@ -7,7 +7,7 @@
# See COPYING available from the same location you got this script.
#
-MESON_WINBUILD_VERSION="3.0.94-alpha"
+MESON_WINBUILD_VERSION="3.1.0-alpha"
CROSSER_FEATURE_LEVEL=2.3
if test "x$1" = x || test "x$1" = "x-h" || test "x$1" = "x--help" ; then
@@ -23,7 +23,8 @@ fi
GUI="$2"
if test "$GUI" != "gtk3.22" && test "$GUI" != "gtk4" &&
- test "$GUI" != "sdl2" && test "$GUI" != "qt5" ; then
+ test "$GUI" != "sdl2" &&
+ test "$GUI" != "qt5" && test "$GUI" != "qt6" ; then
echo "Unknown gui \"$2\"" >&2
exit 1
fi
@@ -77,6 +78,10 @@ case $GUI in
NLS="-Dnls=false"
RULEDIT=true
QTPARAMS="-Dqtver=qt5" ;;
+ qt6) CLIENT="qt"
+ FCMP="qt"
+ RULEDIT=true
+ QTPARAMS="-Dqtver=qt6" ;;
esac
if test "$CLIENT" = "" ; then
@@ -117,6 +122,8 @@ cd meson-build-${SETUP}-${GUI}
export PKG_CONFIG_PATH=${DLLSPATH}/lib/pkgconfig
+export PATH="$DLLSPATH/linux/libexec:$PATH"
+
if ! meson --cross-file=cross.txt -Dprefix=$MESON_INSTALL_DIR -Dclients=$CLIENT -Dfcmp=$FCMP \
${NLS} -Dsyslua=false -Druledit=$RULEDIT $QTPARAMS \
../../.. $EXTRA_CONFIG ; then
--
2.35.1