From b43cc8c92b1b1344d7cb549362175b18431d6740 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Tue, 1 Jun 2021 04:40:44 +0300
Subject: [PATCH 63/63] installer_cross: Check CROSSER_QT5 from crosser.txt
Check more specifically Qt5. It used to grep any CROSSER_QT.
See osdn #42438
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
windows/installer_cross/build_all_installers.sh | 8 ++++----
windows/installer_cross/winbuild.sh | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/windows/installer_cross/build_all_installers.sh b/windows/installer_cross/build_all_installers.sh
index 4de6964803..675f593087 100755
--- a/windows/installer_cross/build_all_installers.sh
+++ b/windows/installer_cross/build_all_installers.sh
@@ -41,9 +41,9 @@ fi
RET=0
-if grep "CROSSER_QT" $DLLSPATH/crosser.txt | grep yes > /dev/null
+if grep "CROSSER_QT5" $DLLSPATH/crosser.txt | grep yes > /dev/null
then
- CROSSER_QT=yes
+ CROSSER_QT5=yes
fi
if ! ./installer_build.sh $DLLSPATH gtk3.22 ; then
@@ -53,7 +53,7 @@ else
GTK322="Success"
fi
-if test "x$CROSSER_QT" != "xyes" ; then
+if test "x$CROSSER_QT5" != "xyes" ; then
QT="N/A"
elif ! ./installer_build.sh $DLLSPATH qt ; then
RET=1
@@ -69,7 +69,7 @@ else
SDL2="Success"
fi
-if test "x$CROSSER_QT" != "xyes" ; then
+if test "x$CROSSER_QT5" != "xyes" ; then
RULEDIT="N/A"
elif ! ./installer_build.sh $DLLSPATH ruledit ; then
RET=1
diff --git a/windows/installer_cross/winbuild.sh b/windows/installer_cross/winbuild.sh
index 2ff5de4c04..3bac4f4e35 100755
--- a/windows/installer_cross/winbuild.sh
+++ b/windows/installer_cross/winbuild.sh
@@ -7,9 +7,9 @@
# This script is licensed under Gnu General Public License version 2 or later.
# See COPYING available from the same location you got this script.
-# Version 2.3.3 (12-Nov-20)
+# Version 2.3.4 (01-Jun-21)
-WINBUILD_VERSION="2.3.3"
+WINBUILD_VERSION="2.3.4"
MIN_WINVER=0x0601 # Windows 7
CROSSER_FEATURE_LEVEL=2.0
@@ -122,7 +122,7 @@ else
fi
if test "x$SINGLE_GUI" != "xtrue" ; then
- if grep "CROSSER_QT" $DLLSPATH/crosser.txt | grep yes > /dev/null
+ if grep "CROSSER_QT5" $DLLSPATH/crosser.txt | grep yes > /dev/null
then
CLIENTS="$CLIENTS,qt"
FCMP="$FCMP,qt"
--
2.30.2