From d90e4f5137b7c8ade2b4fb15794bd1218b537978 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 23 Nov 2021 05:25:48 +0200 Subject: [PATCH 5/5] Update to crosser-2.2 See osdn #43259 Signed-off-by: Marko Lindqvist --- windows/installer_cross/installer_build.sh | 1 + windows/installer_cross/meson-winbuild.sh | 4 ++-- windows/installer_cross/winbuild.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/windows/installer_cross/installer_build.sh b/windows/installer_cross/installer_build.sh index f7818312fa..1838c0402e 100755 --- a/windows/installer_cross/installer_build.sh +++ b/windows/installer_cross/installer_build.sh @@ -4,6 +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/ && mkdir -p $2/bin && cp $1/bin/glib-compile-schemas.exe $2/bin/ } diff --git a/windows/installer_cross/meson-winbuild.sh b/windows/installer_cross/meson-winbuild.sh index be8b873f71..5c914b6bd8 100755 --- a/windows/installer_cross/meson-winbuild.sh +++ b/windows/installer_cross/meson-winbuild.sh @@ -7,8 +7,8 @@ # See COPYING available from the same location you got this script. # -MESON_WINBUILD_VERSION="3.0.0-beta" -CROSSER_FEATURE_LEVEL=2.1 +MESON_WINBUILD_VERSION="3.0.93-alpha" +CROSSER_FEATURE_LEVEL=2.2 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 145869a507..f6df1151bb 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.1 +CROSSER_FEATURE_LEVEL=2.2 if test "x$1" = x || test "x$1" = "x-h" || test "x$1" = "x--help" ; then echo "Usage: $0 [gui]" -- 2.30.2