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 /config-msvc | |
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 'config-msvc')
-rwxr-xr-x | config-msvc | 17 |
1 files changed, 6 insertions, 11 deletions
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+"$@"} |