From bc3538983edaaf4e12e7a7c6f4a77901bcb696da Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 25 Oct 2022 02:21:01 +0300 Subject: [PATCH 35/35] Update to crosser-2.5 See osdn #45701 Signed-off-by: Marko Lindqvist --- windows/installer_cross/installer_build.sh | 4 ++-- windows/installer_cross/meson-installer_build.sh | 4 ++-- windows/installer_cross/meson-winbuild.sh | 2 +- windows/installer_cross/winbuild.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/windows/installer_cross/installer_build.sh b/windows/installer_cross/installer_build.sh index 195b67eeca..7e16f9c05e 100755 --- a/windows/installer_cross/installer_build.sh +++ b/windows/installer_cross/installer_build.sh @@ -4,7 +4,7 @@ add_glib_env() { mkdir -p $2/share/glib-2.0/schemas && cp -R $1/share/glib-2.0/schemas/*.gschema.xml $2/share/glib-2.0/schemas/ && cp $1/bin/libglib-2.0-0.dll $2/ && - cp $1/bin/libpcre-1.dll $2/ && + cp $1/bin/libpcre2-8-0.dll $2/ && mkdir -p $2/bin && cp $1/bin/glib-compile-schemas.exe $2/bin/ } @@ -99,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.12 $2/ && + cp $1/bin/libz.dll.1.2.13 $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 6ae91caf8d..71f950c24c 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.12 $2/ && + cp $1/bin/libz.dll.1.2.13 $2/ && cp $1/bin/liblzma-5.dll $2/ && cp $1/bin/libzstd-1.dll $2/ && cp $1/bin/libintl-8.dll $2/ && @@ -17,7 +17,7 @@ add_common_env() { add_glib_env() { cp $1/bin/libglib-2.0-0.dll $2/ && - cp $1/bin/libpcre-1.dll $2/ + cp $1/bin/libpcre2-8-0.dll $2/ } add_sdl2_mixer_env() { diff --git a/windows/installer_cross/meson-winbuild.sh b/windows/installer_cross/meson-winbuild.sh index b155e027ff..875903f2df 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.4 +CROSSER_FEATURE_LEVEL=2.5 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 139e6478f2..2f27d9d504 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.4 +CROSSER_FEATURE_LEVEL=2.5 if test "x$1" = x || test "x$1" = "x-h" || test "x$1" = "x--help" ; then echo "Usage: $0 [gui]" -- 2.35.1