From: Klas Lindfors <klas@yubico.com>
Date: Thu, 20 Sep 2012 11:43:53 +0000 (+0200)
Subject: update to windows building for travis
X-Git-Tag: v1.8.0~13
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed976634e09d92bd84683f27da2fee14fdcb4f8d;p=yubikey-personalization

update to windows building for travis
---

diff --git a/.travis.yml b/.travis.yml
index e8965e8..16ed26f 100644
--- 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 8bddc23..c54dbac 100755
--- 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 04d12a1..5046da4 100644
--- 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