sigrok-cross-mingw: Switch from libftdi to libftdi1.

[sigrok-util.git] / cross-compile / mingw / sigrok-cross-mingw

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index 0989a5f6829f4bd12f1205484cc2435ab563e3cd..65887005b859dc334ad399010d79e098feb21c5f 100755 (executable)
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -40,7 +40,6 @@ PARALLEL="-j 2"
 
 # -----------------------------------------------------------------------------
 
-VER_LIBUSB_WIN32=1.2.6.0
 VER_ZADIG=v2.0.1.160
 
 SF_MIRROR=switch.dl.sourceforge.net
@@ -60,7 +59,6 @@ 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
        export PKG_CONFIG_PATH_i686_w64_mingw32_static="$P:$P2"
@@ -111,11 +109,6 @@ 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
@@ -127,7 +120,7 @@ cp -f zadig.exe zadig_xp.exe $PREFIX
 $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 ..