From: Uwe Hermann <redacted>
Date: Sun, 5 Jan 2014 00:48:08 +0000 (+0100)
Subject: sigrok-cross-mingw: Get libusb0.dll from libusb-win32.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=50d4aefd5eb66ae330642675ac60283801ce24a3;p=sigrok-util.git

sigrok-cross-mingw: Get libusb0.dll from libusb-win32.

This is one half of the fix for bug #241.
---

diff --git a/cross-compile/mingw/README b/cross-compile/mingw/README
index 45c9a38..9aeb1ed 100644
--- a/cross-compile/mingw/README
+++ b/cross-compile/mingw/README
@@ -20,6 +20,7 @@ Requirements
  - make
  - git
  - pkg-config (>= 0.22)
+ - unzip
  - MXE
 
 
diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index 5b739bd..00f929a 100755
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -34,6 +34,12 @@ BUILDDIR=./sr_mingw_build
 
 # -----------------------------------------------------------------------------
 
+VER_LIBUSB_WIN32=1.2.6.0
+
+SF_MIRROR=switch.dl.sourceforge.net
+
+# -----------------------------------------------------------------------------
+
 # We need to find tools in the toolchain and in the install directory.
 export PATH=$PREFIX/bin:$MXE/usr/bin:$PATH
 
@@ -78,6 +84,11 @@ EOF
 wget -c http://python.org/ftp/python/3.2.3/python-3.2.3.msi \
      -O $PREFIX/python-3.2.3.msi
 
+# 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 libusb-win32-bin-$VER_LIBUSB_WIN32.zip
+cp -f libusb-win32-bin-$VER_LIBUSB_WIN32/bin/x86/libusb0_x86.dll $PREFIX/libusb0.dll
+
 # libserialport
 git clone git://sigrok.org/libserialport
 cd libserialport