update to windows building for travis

diff --git a/.travis.yml b/.travis.yml
index e8965e835e752e864266eeb14048d401072a24ae..16ed26fb1a5f45f94a9eea4b7de6ffdde672de2e 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,12 +6,10 @@ env:
   - LIBUSB=libusb EXTRA=libusb-dev
   - LIBUSB=libusb-1.0 EXTRA=libusb-1.0-0-dev
 script:
-  - autoreconf -i
-  - ./configure --with-backend=$LIBUSB
-  - make check
+  - ./build-and-test.sh
 before_install:
   - sudo apt-get install -qq libyubikey-dev $EXTRA
 matrix:
   include:
-    - compiler: i586-mingw32msvc-gcc
+    - compiler: gcc
       env: LIBUSB=windows EXTRA=wine

diff --git a/build-and-test.sh b/build-and-test.sh
index 8bddc23707188460149c8f685bd3271eccafa208..c54dbacd3be8c30734c16b3610410c89c65ddf4c 100755 (executable)
--- a/build-and-test.sh
+++ b/build-and-test.sh
@@ -4,16 +4,11 @@ set -e
 
 autoreconf -i
 
-if [ "x$LIBUSB" = "xwin32" ]; then
+if [ "x$LIBUSB" = "xwindows" ]; then
   ./configure --with-backend=stub
   touch ChangeLog
   make dist
-  make -f ykpers4win.mk ykpers4win32
-elif [ "x$LIBUSB" = "xwin64" ]; then
-  ./configure --with-backend=stub
-  touch ChangeLog
-  make dist
-  make -f ykpers4win.mk ykpers4win64
+  make -f ykpers4win.mk ykpers4win32mingw32
 else
   ./configure --with-backend=$LIBUSB
   make check

diff --git a/ykpers4win.mk b/ykpers4win.mk
index 04d12a1351791092df012b907d7851819c1c2cc9..5046da4992aae905070ff6bba1c2a1b4380d9d07 100644 (file)
--- a/ykpers4win.mk
+++ b/ykpers4win.mk
@@ -68,6 +68,9 @@ ykpers4win32:
 ykpers4win64:
        $(MAKE) -f ykpers4win.mk ykpers4win ARCH=64 HOST=x86_64-w64-mingw32 CHECK=check
 
+ykpers4win32mingw32:
+       CFLAGS=-I/usr/i586-mingw32msvc/include/ddk/ $(MAKE) -f ykpers4win.mk ykpers4win ARCH=32 HOST=i586-mingw32msvc CHECK=check
+
 upload-ykpers4win:
        gpg --detach-sign --default-key $(PGPKEYID) \
                $(PACKAGE)-$(VERSION)-win$(BITS).zip