try to fix travis windows build

diff --git a/.travis.yml b/.travis.yml
index 2bfac0961c4dcbebfb2e047f6df3a88f72ee3544..948647d06abb06f2ec53ddfc9ab17599736312a2 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,8 @@ env:
 script:
   - ./build-and-test.sh
 before_install:
-  - sudo apt-get update; sudo apt-get install -qq libyubikey-dev libjson0-dev $EXTRA
+  - sudo apt-get update; sudo apt-get remove -qq $REMOVE; sudo apt-get install -qq libyubikey-dev libjson0-dev $EXTRA
 matrix:
   include:
     - compiler: gcc
-      env: LIBUSB=windows EXTRA=wine
+      env: LIBUSB=windows EXTRA="wine mingw-w64" REMOVE=mingw32

diff --git a/build-and-test.sh b/build-and-test.sh
index fa7e16c288a97da3150d22ef47f7acd87878992a..8e4b8c78aa2dcdb0470e803cb92a3ee98279e279 100755 (executable)
--- 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 ykpers4win32mingw32 `grep ^VERSION Makefile|sed 's/ = /=/'`
+    make -f ykpers4win.mk ykpers4win32 `grep ^VERSION Makefile|sed 's/ = /=/'`
 else
     ./configure --with-backend=$LIBUSB
     make check