From: Uwe Hermann Date: Sun, 7 Dec 2014 16:52:57 +0000 (+0100) Subject: sigrok-cross-mingw: Drop libusb0.dll, always use libusb-1.0. X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=commitdiff_plain;h=ca9127e8a89ab220519a66dcc09faaff808b635d;ds=sidebyside sigrok-cross-mingw: Drop libusb0.dll, always use libusb-1.0. --- diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw index 7208ab8..6588700 100755 --- 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 @@ -110,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