OpenSystemsDevelopment / qpdf

Commit 25687ddd71885c1b0a74d3f3f4e011fadbfd40e0

Authored by Jay Berkenbilt
1 parent e19eb579

Pass additional arguments from Windows config wrappers

Inline Side-by-side
Showing 3 changed files with 5 additions and 3 deletions
config-mingw32
  View file @25687dd
1 #!/bin/sh 1 #!/bin/sh
2 -./configure --disable-test-compare-images --enable-external-libs --enable-werror --with-windows-wordsize=32 --with-buildrules=mingw 2 +./configure --disable-test-compare-images --enable-external-libs --enable-werror --with-windows-wordsize=32 --with-buildrules=mingw ${1+"$@"}
3 # As of autoconf 2.69 and gcc 4.6, autoconf's configure fails to 3 # As of autoconf 2.69 and gcc 4.6, autoconf's configure fails to
4 # recognize that defining _FILE_OFFSET_BITS works with mingw32. 4 # recognize that defining _FILE_OFFSET_BITS works with mingw32.
5 # Append to qpdf-config.h rather than passing CPPFLAGS on the 5 # Append to qpdf-config.h rather than passing CPPFLAGS on the
config-mingw64
  View file @25687dd
@@ -7,4 +7,5 @@ @@ -7,4 +7,5 @@
7 RANLIB=x86_64-w64-mingw32-ranlib \ 7 RANLIB=x86_64-w64-mingw32-ranlib \
8 DLLTOOL=x86_64-w64-mingw32-dlltool \ 8 DLLTOOL=x86_64-w64-mingw32-dlltool \
9 STRIP=x86_64-w64-mingw32-strip \ 9 STRIP=x86_64-w64-mingw32-strip \
10 - OBJDUMP=x86_64-w64-mingw32-objdump 10 + OBJDUMP=x86_64-w64-mingw32-objdump \
  11 + ${1+"$@"}
config-msvc
  View file @25687dd
@@ -4,8 +4,9 @@ if ! test "$wordsize" = "32" -o "$wordsize" = "64"; then @@ -4,8 +4,9 @@ if ! test "$wordsize" = "32" -o "$wordsize" = "64"; then
4 echo "Usage: $0 {32,64}" 4 echo "Usage: $0 {32,64}"
5 exit 2 5 exit 2
6 fi 6 fi
  7 +shift
7 objdump= 8 objdump=
8 if test "$wordsize" = "64"; then 9 if test "$wordsize" = "64"; then
9 objdump=OBJDUMP=x86_64-w64-mingw32-objdump 10 objdump=OBJDUMP=x86_64-w64-mingw32-objdump
10 fi 11 fi
11 -CC=cl CXX="cl -TP -GR" ./configure --disable-test-compare-images --enable-external-libs --enable-werror --with-windows-wordsize=$wordsize --with-buildrules=msvc $objdump 12 +CC=cl CXX="cl -TP -GR" ./configure --disable-test-compare-images --enable-external-libs --enable-werror --with-windows-wordsize=$wordsize --with-buildrules=msvc $objdump ${1+"$@"}