From ec15b6f5298b4a03b96a46ea49c13153450594df Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Sat, 18 Jun 2016 18:40:20 +0200 Subject: [PATCH] scripts/cross-build-mingw.sh: Use newer support libraries with GTK2 Combine the libraries from the GTK3 bundle with GTK from the GTK2 one to get newer GLib & co for GTK2 builds. --- scripts/cross-build-mingw.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/cross-build-mingw.sh b/scripts/cross-build-mingw.sh index 25e2c6d65..c6652338d 100755 --- a/scripts/cross-build-mingw.sh +++ b/scripts/cross-build-mingw.sh @@ -54,7 +54,7 @@ fetch_and_unzip() { local basename=${1##*/} curl -L -# "$1" > "$basename" - unzip -q "$basename" -d "$2" + unzip -qn "$basename" -d "$2" rm -f "$basename" } @@ -87,7 +87,8 @@ mkdir "$BUILDDIR" cd "$BUILDDIR" mkdir _deps -fetch_and_unzip "$BUNDLE_ZIP" _deps +fetch_and_unzip "$GTK3_BUNDLE_ZIP" _deps +[ "$GTK3" = yes ] || fetch_and_unzip "$BUNDLE_ZIP" _deps # fixup the prefix= in the pkg-config files sed -i "s%^\(prefix=\).*$%\1$PWD/_deps%" _deps/lib/pkgconfig/*.pc -- 2.11.4.GIT