From: Uwe Hermann <redacted>
Date: Sun, 5 Jan 2014 09:51:06 +0000 (+0100)
Subject: sigrok-cross-mingw: Also ship zadig.exe and zadig_xp.exe.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=37d3fad3ed5bba7188b99d45e38bef80b11a5a3b;p=sigrok-util.git

sigrok-cross-mingw: Also ship zadig.exe and zadig_xp.exe.

This is a helper tool for installing libusb-win32 or WinUSB drivers on
Windows, which is a requirement for USB devices to be recognized by
libsigrok (libusb actually) on Windows.
---

diff --git a/cross-compile/mingw/README b/cross-compile/mingw/README
index 00758a5..b10c0f0 100644
--- a/cross-compile/mingw/README
+++ b/cross-compile/mingw/README
@@ -22,6 +22,7 @@ Requirements
  - git
  - wget
  - unzip
+ - p7zip
  - pkg-config (>= 0.22)
  - sdcc (needed for building the fx2lafw firmware)
  - nsis
diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index f553208..be20756 100755
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -38,6 +38,7 @@ PARALLEL="-j 2"
 # -----------------------------------------------------------------------------
 
 VER_LIBUSB_WIN32=1.2.6.0
+VER_ZADIG=v2.0.1.160
 
 SF_MIRROR=switch.dl.sourceforge.net
 
@@ -92,6 +93,13 @@ wget -c http://$SF_MIRROR/project/libusb-win32/libusb-win32-releases/$VER_LIBUSB
 unzip 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
+
 # libserialport
 git clone git://sigrok.org/libserialport
 cd libserialport
@@ -154,7 +162,6 @@ cd ..
 git clone git://sigrok.org/pulseview
 cd pulseview
 patch -p1 < ../../pulseview_linkfix.patch
-
 PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_DECODE=y -DENABLE_COTIRE=y .
 make $PARALLEL VERBOSE=1
 make install