From 0a61a105441bce3b14bd4ea99758a27f2b59e7d0 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sat, 5 Mar 2022 21:17:15 +0200
Subject: [PATCH 41/41] Update to crosser-2.3

See osdn #43921

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 windows/installer_cross/installer_build.sh | 3 ++-
 windows/installer_cross/meson-winbuild.sh  | 2 +-
 windows/installer_cross/winbuild.sh        | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/windows/installer_cross/installer_build.sh b/windows/installer_cross/installer_build.sh
index 5dc60f6ca2..c272356e3b 100755
--- a/windows/installer_cross/installer_build.sh
+++ b/windows/installer_cross/installer_build.sh
@@ -72,7 +72,7 @@ add_sdl2_env() {
 }
 
 add_qt5_env() {
-  cp -R $1/plugins $2/ &&
+  cp -R $1/qt5/plugins $2/ &&
   cp $1/bin/Qt5Core.dll $2/ &&
   cp $1/bin/Qt5Gui.dll $2/ &&
   cp $1/bin/Qt5Widgets.dll $2/ &&
@@ -93,6 +93,7 @@ add_qt6_env() {
 add_common_env() {
   cp $1/bin/libcurl-4.dll $2/ &&
   cp $1/bin/liblzma-5.dll $2/ &&
+  cp $1/bin/libzstd-1.dll $2/ &&
   cp $1/bin/libintl-8.dll $2/ &&
   cp $1/bin/libsqlite3-0.dll $2/ &&
   cp $1/bin/libiconv-2.dll $2/ &&
diff --git a/windows/installer_cross/meson-winbuild.sh b/windows/installer_cross/meson-winbuild.sh
index ae972d41e2..08b562d723 100755
--- a/windows/installer_cross/meson-winbuild.sh
+++ b/windows/installer_cross/meson-winbuild.sh
@@ -8,7 +8,7 @@
 #
 
 MESON_WINBUILD_VERSION="3.0.94-alpha"
-CROSSER_FEATURE_LEVEL=2.2
+CROSSER_FEATURE_LEVEL=2.3
 
 if test "x$1" = x || test "x$1" = "x-h" || test "x$1" = "x--help" ; then
   echo "Usage: $0 <crosser dir> <gui>"
diff --git a/windows/installer_cross/winbuild.sh b/windows/installer_cross/winbuild.sh
index 9d36a0500c..a44325f1eb 100755
--- a/windows/installer_cross/winbuild.sh
+++ b/windows/installer_cross/winbuild.sh
@@ -11,7 +11,7 @@
 
 WINBUILD_VERSION="2.4.0"
 MIN_WINVER=0x0601 # Windows 7
-CROSSER_FEATURE_LEVEL=2.2
+CROSSER_FEATURE_LEVEL=2.3
 
 if test "x$1" = x || test "x$1" = "x-h" || test "x$1" = "x--help" ; then
   echo "Usage: $0 <crosser dir> [gui]"
@@ -148,7 +148,7 @@ if test "x$SINGLE_GUI" != "xtrue" ; then
 fi
 
 if test "x$QTVER" = "xQt5" ; then
-  QTPARAMS="--with-qtver=Qt5 --with-qt5-includes=${DLLSPATH}/include --with-qt5-libs=${DLLSPATH}/lib"
+  QTPARAMS="--with-qtver=Qt5 --with-qt5-includes=${DLLSPATH}/qt5/include --with-qt5-libs=${DLLSPATH}/lib"
   MOC_CROSSER="${DLLSPATH}/bin/moc"
 elif test "x$QTVER" = "xQt6"; then
   QTPARAMS="--with-qtver=Qt6 --with-qt6-includes=${DLLSPATH}/qt6/include --with-qt6-libs=${DLLSPATH}/lib"
-- 
2.34.1