From f735b7ddc626ea2fe6c436c8ae78489e32a19c54 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 21 Sep 2021 04:15:36 +0300 Subject: [PATCH 28/28] Update to crosser-2.1 See osdn #42067 Signed-off-by: Marko Lindqvist --- windows/installer_cross/installer_build.sh | 11 +++++------ windows/installer_cross/meson-winbuild.sh | 2 +- windows/installer_cross/winbuild.sh | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/windows/installer_cross/installer_build.sh b/windows/installer_cross/installer_build.sh index e96d4fa231..f7818312fa 100755 --- a/windows/installer_cross/installer_build.sh +++ b/windows/installer_cross/installer_build.sh @@ -28,13 +28,14 @@ add_gtk3_env() { cp $1/bin/libfribidi-0.dll $2/ && cp $1/bin/libpango-1.0-0.dll $2/ && cp $1/bin/libpangocairo-1.0-0.dll $2/ && - cp $1/bin/libffi-7.dll $2/ && + cp $1/bin/libffi-8.dll $2/ && cp $1/bin/libatk-1.0-0.dll $2/ && cp $1/bin/libgmodule-2.0-0.dll $2/ && cp $1/bin/libpangowin32-1.0-0.dll $2/ && cp $1/bin/libfontconfig-1.dll $2/ && cp $1/bin/libpangoft2-1.0-0.dll $2/ && cp $1/bin/libxml2-2.dll $2/ && + cp $1/bin/libjpeg-9.dll $2/ && mkdir -p $2/bin && cp $1/bin/gdk-pixbuf-query-loaders.exe $2/bin/ && cp $1/bin/gtk-update-icon-cache.exe $2/bin/ && @@ -59,8 +60,7 @@ add_sdl2_mixer_env() { add_sdl2_env() { cp $1/bin/SDL2_image.dll $2/ && cp $1/bin/SDL2_ttf.dll $2/ && - cp $1/bin/libtiff-5.dll $2/ && - cp $1/bin/libjpeg-9.dll $2/ + cp $1/bin/libtiff-5.dll $2/ } add_qt_env() { @@ -80,12 +80,11 @@ add_common_env() { 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/lib/icuuc63.dll $2/ && - cp $1/lib/icudt63.dll $2/ && + cp $1/lib/icuuc64.dll $2/ && + cp $1/lib/icudt64.dll $2/ && cp $1/bin/libpng16-16.dll $2/ && cp $1/bin/libfreetype-6.dll $2/ && cp $1/bin/libharfbuzz-0.dll $2/ && - cp $1/bin/libpcre-1.dll $2/ && add_glib_env $1 $2 } diff --git a/windows/installer_cross/meson-winbuild.sh b/windows/installer_cross/meson-winbuild.sh index 7d2a565d89..be8b873f71 100755 --- a/windows/installer_cross/meson-winbuild.sh +++ b/windows/installer_cross/meson-winbuild.sh @@ -8,7 +8,7 @@ # MESON_WINBUILD_VERSION="3.0.0-beta" -CROSSER_FEATURE_LEVEL=2.0 +CROSSER_FEATURE_LEVEL=2.1 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 3bac4f4e35..145869a507 100755 --- a/windows/installer_cross/winbuild.sh +++ b/windows/installer_cross/winbuild.sh @@ -11,7 +11,7 @@ WINBUILD_VERSION="2.3.4" MIN_WINVER=0x0601 # Windows 7 -CROSSER_FEATURE_LEVEL=2.0 +CROSSER_FEATURE_LEVEL=2.1 if test "x$1" = x || test "x$1" = "x-h" || test "x$1" = "x--help" ; then echo "Usage: $0 [gui]" -- 2.33.0