X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=tools%2Fmake-windows-release;h=17769b06c532f7b4419238e3bdca3b67938b3a9b;hp=ee9790db510b767acd534e553b88c8edf413e2e9;hb=d4257e661edb24f7bdd5c3272aec666dac42213b;hpb=64a61fd12ad824ac080c26fc8c453d001f389ef1 diff --git a/tools/make-windows-release b/tools/make-windows-release index ee9790db..17769b06 100755 --- a/tools/make-windows-release +++ b/tools/make-windows-release @@ -27,8 +27,8 @@ i686|x86_64) ;; esac -VERSION=$(grep 'This is wimlib version' README | \ - grep -o '\<[0-9]\+\.[0-9]\+\.[0-9]\+\(-BETA\)\?\>') +VERSION=$(grep 'AC_INIT' configure.ac | \ + grep -o '[0-9]\+\.[0-9]\+\.[0-9]\+[^]]*') DESTDIR=wimlib-${VERSION}-windows-${ARCH}-bin ZIPFILE=wimlib-${VERSION}-windows-${ARCH}-bin.zip MAKE="make -j $(grep -c processor /proc/cpuinfo)" @@ -46,14 +46,19 @@ fi if ! grep -q "./configure --host=${ARCH}-w64-mingw32" config.log || \ ! grep -q "configure: exit 0" config.log then + extra_args= + if [ $ARCH = x86_64 ]; then + extra_args="--enable-ssse3-sha1" + fi # Note: putting -static-libgcc in CC is a workaround for libtool # stripping it: # http://www.gnu.org/software/libtool/manual/libtool.html#Stripped-link-flags ./configure --host=${ARCH}-w64-mingw32 --disable-static \ CC="${ARCH}-w64-mingw32-gcc -static-libgcc" \ CFLAGS="-O2 -Wall" \ - CPPFLAGS="-I$SYSROOT/include -I$SYSROOT/include/libxml2"\ - LDFLAGS="-L$SYSROOT/lib" + CPPFLAGS="-I$SYSROOT/include -I$SYSROOT/include/libxml2 -DLIBXML_STATIC"\ + LDFLAGS="-L$SYSROOT/lib" \ + $extra_args $MAKE clean fi $MAKE