diff options
author | Jay Berkenbilt <ejb@ql.org> | 2017-08-21 14:39:41 +0200 |
---|---|---|
committer | Jay Berkenbilt <ejb@ql.org> | 2017-08-21 23:44:22 +0200 |
commit | 389396dbbf83f3df62a62601c5963d12fc1143f6 (patch) | |
tree | 552a671d4f917af2123bc977a9c026962d36969c /make_windows_releases | |
parent | af9e36b5070ebd5f6f747348170791d50a765403 (diff) | |
download | qpdf-389396dbbf83f3df62a62601c5963d12fc1143f6.tar.zst |
Support Windows builds with MSYS2
Replace the old msys, mingw-w64, ActiveState perl setup with MSYS2.
This greatly simplifies the Windows build. This was facilitated by the
need to incorporate JPEG.
Diffstat (limited to 'make_windows_releases')
-rwxr-xr-x | make_windows_releases | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/make_windows_releases b/make_windows_releases index b7bc689d..84d2a221 100755 --- a/make_windows_releases +++ b/make_windows_releases @@ -1,29 +1,37 @@ #!/bin/sh + if [ ! -d external-libs ]; then echo "Please extract qpdf-external-libs-bin.zip and try again" exit 2 fi +if echo $PATH | grep -q /mingw64; then + wordsize=64 +else + wordsize=32 +fi + set -e set -x cwd=`pwd` PATH=$cwd/libqpdf/build:$PATH -rm -rf install-mingw* install-msvc* +rm -rf install-mingw$wordsize install-msvc$wordsize -./config-mingw64 -make +./config-mingw +make -j8 make check install make distclean -./config-mingw32 -make + +./config-msvc +make -j8 make check install make distclean set +x echo '' -echo 'Now run "./make_windows_releases-msvc 64" in a 64-bit MSVC environment' -echo 'and "./make_windows_releases-msvc 32" in a 32-bit MSVC environment.' +echo "Finished builds for $wordsize. If not done already, rerun this" +echo "in a" `expr 64 - $wordsize` "environment." echo 'Then run "./make_windows_releases-finish".' echo '' |