X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmingw%2Fsigrok-cross-mingw;h=e7cd23573ab936aaf88186091cdddc24906924e5;hp=0989a5f6829f4bd12f1205484cc2435ab563e3cd;hb=533e3e6c5286f6def5f31a58964047936910f94e;hpb=749d40972a054f64d5008713dffa680160dacdf2

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index 0989a5f..e7cd235 100755
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 ##
 ## This file is part of the sigrok-util project.
 ##
@@ -40,12 +40,9 @@ PARALLEL="-j 2"
 
 # -----------------------------------------------------------------------------
 
-VER_LIBUSB_WIN32=1.2.6.0
-VER_ZADIG=v2.0.1.160
-
 SF_MIRROR=switch.dl.sourceforge.net
 
-WGET="wget --quiet"
+WGET="wget -c --quiet"
 GIT_CLONE="git clone --depth=1"
 
 # -----------------------------------------------------------------------------
@@ -60,9 +57,8 @@ P2="$MXE/usr/$TOOLCHAIN_TRIPLET/lib/pkgconfig"
 C="--host=$TOOLCHAIN_TRIPLET --prefix=$PREFIX"
 CM="-DCMAKE_TOOLCHAIN_FILE=$MXE/usr/$TOOLCHAIN_TRIPLET/share/cmake/mxe-conf.cmake"
 L="--disable-shared --enable-static"
-DDK="$MXE/usr/$TOOLCHAIN_TRIPLET/include/ddk"
 
-if [ $TARGET == "i686" ]; then
+if [ $TARGET = "i686" ]; then
 	export PKG_CONFIG_PATH_i686_w64_mingw32_static="$P:$P2"
 else
 	export PKG_CONFIG_PATH_x86_64_w64_mingw32_static="$P:$P2"
@@ -111,23 +107,15 @@ EOF
 $WGET http://www.sigrok.org/tmp/python32_$TARGET.dll -O $PREFIX/python32.dll
 $WGET http://www.sigrok.org/tmp/python32_$TARGET.zip -O $PREFIX/python32.zip
 
-# libusb0.dll (needs to be shipped with frontends)
-$WGET -c http://$SF_MIRROR/project/libusb-win32/libusb-win32-releases/$VER_LIBUSB_WIN32/libusb-win32-bin-$VER_LIBUSB_WIN32.zip
-unzip -q libusb-win32-bin-$VER_LIBUSB_WIN32.zip
-cp -f libusb-win32-bin-$VER_LIBUSB_WIN32/bin/x86/libusb0_x86.dll $PREFIX/libusb0.dll
-
 # Zadig (we ship this with frontends for easy driver switching).
-$WGET -c http://$SF_MIRROR/project/libwdi/zadig/zadig_$VER_ZADIG.7z
-$WGET -c http://$SF_MIRROR/project/libwdi/zadig/zadig_xp_$VER_ZADIG.7z
-7zr e zadig_$VER_ZADIG.7z
-7zr e zadig_xp_$VER_ZADIG.7z
-cp -f zadig.exe zadig_xp.exe $PREFIX
+$WGET http://zadig.akeo.ie/downloads/zadig.exe -O $PREFIX/zadig.exe
+$WGET http://zadig.akeo.ie/downloads/zadig_xp.exe -O $PREFIX/zadig_xp.exe
 
 # libserialport
 $GIT_CLONE git://sigrok.org/libserialport
 cd libserialport
 ./autogen.sh
-CFLAGS="-I$DDK" ./configure $C $L
+./configure $C $L
 make $PARALLEL V=1
 make install
 cd ..
@@ -192,7 +180,7 @@ $GIT_CLONE git://sigrok.org/pulseview
 cd pulseview
 cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y .
 make $PARALLEL VERBOSE=1
-make install
+make install/strip
 makensis -DHOME=$HOME contrib/pulseview_cross.nsi
 cd ..