From: Klas Lindfors Date: Fri, 19 Apr 2013 09:55:59 +0000 (+0200) Subject: let travis build win32 and win64 X-Git-Tag: v1.13.0~20 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=225c1314c7c20d36beaed42ed43079a6917ed0e0;p=yubikey-personalization let travis build win32 and win64 --- diff --git a/.travis.yml b/.travis.yml index 948647d..29f20aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,4 +12,6 @@ before_install: matrix: include: - compiler: gcc - env: LIBUSB=windows EXTRA="wine mingw-w64" REMOVE=mingw32 + env: LIBUSB=windows EXTRA="wine mingw-w64" REMOVE=mingw32 ARCH=32 + - compiler: gcc + env: LIBUSB=windows EXTRA="wine mingw-w64" REMOVE=mingw32 ARCH=64 diff --git a/build-and-test.sh b/build-and-test.sh index 8e4b8c7..3b22cfe 100755 --- a/build-and-test.sh +++ b/build-and-test.sh @@ -9,7 +9,7 @@ if [ "x$LIBUSB" = "xwindows" ]; then ./configure --with-backend=stub touch ChangeLog make dist - make -f ykpers4win.mk ykpers4win32 `grep ^VERSION Makefile|sed 's/ = /=/'` + make -f ykpers4win.mk ykpers4win${ARCH} `grep ^VERSION Makefile|sed 's/ = /=/'` else ./configure --with-backend=$LIBUSB make check