From b88fb5a1289f496ee15d1a47d023381385457f22 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 2 Sep 2023 15:13:16 +0300 Subject: [PATCH 8/8] Update to crosser-2.7 See osdn #48552 Signed-off-by: Marko Lindqvist --- windows/installer_cross/installer_build.sh | 2 +- windows/installer_cross/meson-installer_build.sh | 2 +- windows/installer_cross/meson-winbuild.sh | 2 +- windows/installer_cross/winbuild.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/windows/installer_cross/installer_build.sh b/windows/installer_cross/installer_build.sh index 79f710f976..75f6441e55 100755 --- a/windows/installer_cross/installer_build.sh +++ b/windows/installer_cross/installer_build.sh @@ -112,7 +112,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.13 $2/ && + cp $1/bin/libz.dll.1.3 $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 d108382bb4..00ce1a9083 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.13 $2/ && + cp $1/bin/libz.dll.1.3 $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 742c6c73cd..d360dcb708 100755 --- a/windows/installer_cross/meson-winbuild.sh +++ b/windows/installer_cross/meson-winbuild.sh @@ -9,7 +9,7 @@ MESON_WINBUILD_VERSION="3.1.0-beta" MIN_WINVER=0x0603 # Windows 8.1. Qt6-client and Qt6-ruledit builds override this -CROSSER_FEATURE_LEVEL=2.6 +CROSSER_FEATURE_LEVEL=2.7 if test "$1" = "" || test "$1" = "-h" || test "$1" = "--help" ; then echo "Usage: $0 " diff --git a/windows/installer_cross/winbuild.sh b/windows/installer_cross/winbuild.sh index 5f5b3c42fa..5224ec9cd4 100755 --- a/windows/installer_cross/winbuild.sh +++ b/windows/installer_cross/winbuild.sh @@ -11,7 +11,7 @@ WINBUILD_VERSION="2.4.3" MIN_WINVER=0x0603 # Windows 8.1, Qt6-client and Qt6-ruledit builds override this -CROSSER_FEATURE_LEVEL=2.6 +CROSSER_FEATURE_LEVEL=2.7 if test "$1" = "" || test "$1" = "-h" || test "$1" = "--help" ; then echo "Usage: $0 [gui]" -- 2.40.1