X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=cross-compile%2Fmingw%2Fsigrok-cross-mingw;h=11660c90f5a85eb561714fa71364e9c3ec04b0d2;hb=23384c8c7d02a5ea03facc9bbf81cdfc06d4071b;hp=52adc16b0ca784b128885ecfe11025af11d86d46;hpb=e2eb056c5614bd00d89cc4caae3d32c56dccf7e5;p=sigrok-util.git

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index 52adc16..11660c9 100755
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -38,9 +38,12 @@ 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"
+
 # -----------------------------------------------------------------------------
 
 # We need to find tools in the toolchain and in the install directory.
@@ -66,7 +69,7 @@ cd $BUILDDIR
 # The MSI file has been installed on a Windows box and then the c:\Python32
 # files have been stored in the Python32.tar.gz tarball.
 mkdir -p $PREFIX
-wget http://www.sigrok.org/tmp/Python32.tar.gz -O $PREFIX/Python32.tar.gz
+$WGET http://www.sigrok.org/tmp/Python32.tar.gz -O $PREFIX/Python32.tar.gz
 tar xzf $PREFIX/Python32.tar.gz -C $PREFIX
 
 # Create a dummy python3.pc file so that pkg-config finds Python 3.
@@ -84,20 +87,27 @@ Cflags: -I$PREFIX/Python32/include
 EOF
 
 # Download the Python 3.2.3 MSI installer (needed for NSIS runs).
-wget -c http://python.org/ftp/python/3.2.3/python-3.2.3.msi \
-     -O $PREFIX/python-3.2.3.msi
+$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
+$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
+
 # libserialport
 git clone git://sigrok.org/libserialport
 cd libserialport
 ./autogen.sh
 PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L
-make $PARALLEL
+make $PARALLEL V=1
 make install
 cd ..
 
@@ -107,7 +117,7 @@ cd libsigrok
 patch -p1 < ../../libsigrok_firmwaredir.patch
 ./autogen.sh
 PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L
-make $PARALLEL
+make $PARALLEL V=1
 make install
 cd ..
 
@@ -116,7 +126,7 @@ git clone git://sigrok.org/libsigrokdecode
 cd libsigrokdecode
 ./autogen.sh
 PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L
-make $PARALLEL
+make $PARALLEL V=1
 make install
 cd ..
 
@@ -135,7 +145,7 @@ cd sigrok-firmware-fx2lafw
 ./autogen.sh
 # We're building the fx2lafw firmware on the host, no need to cross-compile.
 ./configure --prefix=$PREFIX
-make $PARALLEL
+make $PARALLEL V=1
 make install
 cd ..
 
@@ -145,7 +155,7 @@ cd sigrok-cli
 patch -p1 < ../../sigrok_cli_decodersdir.patch
 ./autogen.sh
 PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 ./configure $C
-make $PARALLEL
+make $PARALLEL V=1
 make install
 makensis -DHOME=$HOME contrib/sigrok-cli_cross.nsi
 cd ..
@@ -153,9 +163,8 @@ cd ..
 # PulseView
 git clone git://sigrok.org/pulseview
 cd pulseview
-patch -p1 < ../../pulseview_linkfix.patch
 patch -p1 < ../../pulseview_decodersdir.patch
-PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_DECODE=y .
+PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_DECODE=y -DENABLE_COTIRE=y -DENABLE_TESTS=y .
 make $PARALLEL VERBOSE=1
 make install
 makensis -DHOME=$HOME contrib/pulseview_cross.nsi