From 389396dbbf83f3df62a62601c5963d12fc1143f6 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Mon, 21 Aug 2017 08:39:41 -0400
Subject: 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.
---
 make_windows_releases | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'make_windows_releases')

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 ''
-- 
cgit v1.2.3-54-g00ecf