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.
---
 config-msvc | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'config-msvc')

diff --git a/config-msvc b/config-msvc
index dc10454b..762e4867 100755
--- a/config-msvc
+++ b/config-msvc
@@ -1,14 +1,9 @@
 #!/bin/sh
-wordsize=$1
-if ! test "$wordsize" = "32" -o "$wordsize" = "64"; then
-    echo "Usage: $0 {32,64}"
-    exit 2
-fi
-shift
-objdump=
-if test "$wordsize" = "64"; then
-    objdump=$(dirname $(type -p x86_64-w64-mingw32-gcc))/objdump
+set -e
+set -x
+if echo $PATH | grep -q /mingw64; then
+    wordsize=64
 else
-    objdump=$(dirname $(type -p i686-w64-mingw32-gcc))/objdump
+    wordsize=32
 fi
-CC=cl CXX="cl -TP -GR" ./configure --disable-test-compare-images --enable-external-libs --enable-werror --with-windows-wordsize=$wordsize --with-buildrules=msvc OBJDUMP=$objdump ${1+"$@"}
+CC=cl CXX="cl -TP -GR" ./configure --disable-test-compare-images --enable-external-libs --enable-werror --with-windows-wordsize=$wordsize --with-buildrules=msvc ${1+"$@"}
-- 
cgit v1.2.3-70-g09d2