X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=scripts%2Fci-build-mingw.sh;h=8173aa64bd29f91803192974ce843e16918b92f3;hb=67f852be576027e07c94f08ff65f8065244e59a0;hp=58b7a82e2e85b3011145f05227cff0ded9517298;hpb=f05f84b33b19ed11fc1d6eef48286a06c59b06ce;p=irrlicht.git

diff --git a/scripts/ci-build-mingw.sh b/scripts/ci-build-mingw.sh
index 58b7a82..8173aa6 100755
--- a/scripts/ci-build-mingw.sh
+++ b/scripts/ci-build-mingw.sh
@@ -3,27 +3,29 @@
 [[ -z "$CC" || -z "$CXX" ]] && exit 255
 
 variant=win32
-[[ "$CXX" == "x86_64-"* ]] && variant=win64
+[[ "$(basename "$CXX")" == "x86_64-"* ]] && variant=win64
 
-libjpeg_version=2.0.6
+libjpeg_version=2.1.2
 libpng_version=1.6.37
 zlib_version=1.2.11
 
 mkdir -p libs
 pushd libs
 libs=$PWD
+tmp=
+[ "$variant" = win32 ] && tmp=dw2/
 [ -e libjpeg.zip ] || \
 	wget "http://minetest.kitsunemimi.pw/libjpeg-$libjpeg_version-$variant.zip" -O libjpeg.zip
 [ -e libpng.zip ] || \
-	wget "http://minetest.kitsunemimi.pw/libpng-$libpng_version-$variant.zip" -O libpng.zip
+	wget "http://minetest.kitsunemimi.pw/${tmp}libpng-$libpng_version-$variant.zip" -O libpng.zip
 [ -e zlib.zip ] || \
-	wget "http://minetest.kitsunemimi.pw/zlib-$zlib_version-$variant.zip" -O zlib.zip
+	wget "http://minetest.kitsunemimi.pw/${tmp}zlib-$zlib_version-$variant.zip" -O zlib.zip
 [ -d libjpeg ] || unzip -o libjpeg.zip -d libjpeg
 [ -d libpng ] || unzip -o libpng.zip -d libpng
 [ -d zlib ] || unzip -o zlib.zip -d zlib
 popd
 
-cmake . \
+tmp=(
 	-DCMAKE_SYSTEM_NAME=Windows \
 	-DPNG_LIBRARY=$libs/libpng/lib/libpng.dll.a \
 	-DPNG_PNG_INCLUDE_DIR=$libs/libpng/include \
@@ -31,6 +33,18 @@ cmake . \
 	-DJPEG_INCLUDE_DIR=$libs/libjpeg/include \
 	-DZLIB_LIBRARY=$libs/zlib/lib/libz.dll.a \
 	-DZLIB_INCLUDE_DIR=$libs/zlib/include
+)
 
+cmake . "${tmp[@]}"
 make -j$(nproc)
+
+if [ "$1" = "package" ]; then
+	make DESTDIR=$PWD/_install install
+	# strip library
+	"${CXX%-*}-strip" --strip-unneeded _install/usr/local/lib/*.dll
+	# bundle the DLLs that are specific to Irrlicht (kind of a hack)
+	cp -p $libs/*/bin/lib{jpeg,png}*.dll _install/usr/local/lib/
+	# create a ZIP
+	(cd _install/usr/local; zip -9r "$OLDPWD"/irrlicht-$variant.zip -- *)
+fi
 exit 0