From d34fdfeaef7d8f66820af0b18f0a9d92b3764d35 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 14 Aug 2022 17:45:35 +0300 Subject: [PATCH 40/40] Update to crosser-2.4 See osdn #44724 Signed-off-by: Marko Lindqvist --- windows/installer_cross/installer_build.sh | 3 ++- windows/installer_cross/meson-installer_build.sh | 2 +- windows/installer_cross/meson-winbuild.sh | 2 +- windows/installer_cross/winbuild.sh | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/windows/installer_cross/installer_build.sh b/windows/installer_cross/installer_build.sh index 091d38db0b..195b67eeca 100755 --- a/windows/installer_cross/installer_build.sh +++ b/windows/installer_cross/installer_build.sh @@ -87,6 +87,7 @@ add_qt6_env() { cp $1/bin/Qt6Core.dll $2/ && cp $1/bin/Qt6Gui.dll $2/ && cp $1/bin/Qt6Widgets.dll $2/ && + cp $1/bin/libpcre2-16-0.dll $2/ && mkdir -p $2/bin && cp ./helpers/installer-helper-qt.cmd $2/bin/installer-helper.cmd } @@ -98,7 +99,7 @@ add_common_env() { cp $1/bin/libintl-8.dll $2/ && cp $1/bin/libsqlite3-0.dll $2/ && cp $1/bin/libiconv-2.dll $2/ && - cp $1/bin/libz.dll.1.2.11 $2/ && + cp $1/bin/libz.dll.1.2.12 $2/ && cp $1/lib/icuuc64.dll $2/ && cp $1/lib/icudt64.dll $2/ && cp $1/bin/libpng16-16.dll $2/ && diff --git a/windows/installer_cross/meson-installer_build.sh b/windows/installer_cross/meson-installer_build.sh index ef967cc8fa..51fd9c3085 100755 --- a/windows/installer_cross/meson-installer_build.sh +++ b/windows/installer_cross/meson-installer_build.sh @@ -2,7 +2,7 @@ add_common_env() { cp $1/bin/libcurl-4.dll $2/ && - cp $1/bin/libz.dll.1.2.11 $2/ && + cp $1/bin/libz.dll.1.2.12 $2/ && cp $1/bin/liblzma-5.dll $2/ && cp $1/bin/libzstd-1.dll $2/ && cp $1/bin/libintl-8.dll $2/ && diff --git a/windows/installer_cross/meson-winbuild.sh b/windows/installer_cross/meson-winbuild.sh index 59feaf9220..5a6c51c424 100755 --- a/windows/installer_cross/meson-winbuild.sh +++ b/windows/installer_cross/meson-winbuild.sh @@ -8,7 +8,7 @@ # MESON_WINBUILD_VERSION="3.1.0-alpha" -CROSSER_FEATURE_LEVEL=2.3 +CROSSER_FEATURE_LEVEL=2.4 if test "x$1" = x || test "x$1" = "x-h" || test "x$1" = "x--help" ; then echo "Usage: $0 " diff --git a/windows/installer_cross/winbuild.sh b/windows/installer_cross/winbuild.sh index e1a77d7aea..985061c48e 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.3 +CROSSER_FEATURE_LEVEL=2.4 if test "x$1" = x || test "x$1" = "x-h" || test "x$1" = "x--help" ; then echo "Usage: $0 [gui]" -- 2.35.1