X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmingw%2Fsigrok-cross-mingw;h=a7d625f3b95dc22c179d9f028f7eb729030997ab;hp=1dac2c40a0cfaf6483d2c013d31ac4587cb76637;hb=4e8697df7f33d4014cef88214b02d4a56addcde9;hpb=fd214a32cf330bc99690877326ee745ab3ca2162

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index 1dac2c4..a7d625f 100755
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 ##
 ## This file is part of the sigrok-util project.
 ##
@@ -33,6 +33,9 @@ PREFIX=$HOME/sr_mingw
 # The path where to download files to and where to build packages.
 BUILDDIR=./build
 
+# Edit this to control verbose build output.
+# V="V=1 VERBOSE=1"
+
 # Edit this to enable/disable/modify parallel compiles.
 PARALLEL="-j 2"
 
@@ -54,11 +57,11 @@ TOOLCHAIN_TRIPLET="$TARGET-w64-mingw32.static"
 
 P="$PREFIX/lib/pkgconfig"
 P2="$MXE/usr/$TOOLCHAIN_TRIPLET/lib/pkgconfig"
-C="--host=$TOOLCHAIN_TRIPLET --prefix=$PREFIX"
+C="--host=$TOOLCHAIN_TRIPLET --prefix=$PREFIX CPPFLAGS=-D__printf__=__gnu_printf__"
 CM="-DCMAKE_TOOLCHAIN_FILE=$MXE/usr/$TOOLCHAIN_TRIPLET/share/cmake/mxe-conf.cmake"
 L="--disable-shared --enable-static"
 
-if [ $TARGET == "i686" ]; then
+if [ $TARGET = "i686" ]; then
 	export PKG_CONFIG_PATH_i686_w64_mingw32_static="$P:$P2"
 else
 	export PKG_CONFIG_PATH_x86_64_w64_mingw32_static="$P:$P2"
@@ -111,13 +114,22 @@ $WGET http://www.sigrok.org/tmp/python32_$TARGET.zip -O $PREFIX/python32.zip
 $WGET http://zadig.akeo.ie/downloads/zadig.exe -O $PREFIX/zadig.exe
 $WGET http://zadig.akeo.ie/downloads/zadig_xp.exe -O $PREFIX/zadig_xp.exe
 
+# libusb
+$GIT_CLONE git://github.com/dickens/libusb -b event-abstraction-v4
+cd libusb
+./bootstrap.sh
+./configure $C $L
+make -j1 $V
+make install $V
+cd ..
+
 # libserialport
 $GIT_CLONE git://sigrok.org/libserialport
 cd libserialport
 ./autogen.sh
 ./configure $C $L
-make $PARALLEL V=1
-make install
+make $PARALLEL $V
+make install $V
 cd ..
 
 # libsigrok
@@ -126,8 +138,8 @@ cd libsigrok
 patch -p1 < ../../libsigrok_firmwaredir.patch
 ./autogen.sh
 ./configure $C $L
-make $PARALLEL V=1
-make install
+make $PARALLEL $V
+make install $V
 cd ..
 
 # libsigrokdecode
@@ -136,8 +148,8 @@ cd libsigrokdecode
 ./autogen.sh
 patch -p1 < ../../srd_decodersdir.patch
 ./configure $C $L
-make $PARALLEL V=1
-make install
+make $PARALLEL $V
+make install $V
 cd ..
 
 # sigrok-firmware
@@ -146,7 +158,7 @@ cd sigrok-firmware
 ./autogen.sh
 # Nothing gets cross-compiled here, we just need 'make install' basically.
 ./configure --prefix=$PREFIX
-make install
+make install $V
 cd ..
 
 # sigrok-firmware-fx2lafw
@@ -155,14 +167,14 @@ 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 V=1
-make install
+make $PARALLEL $V
+make install $V
 cd ..
 
 # sigrok-dumps
 $GIT_CLONE git://sigrok.org/sigrok-dumps
 cd sigrok-dumps
-make install DESTDIR=$PREFIX/share/sigrok-dumps
+make install DESTDIR=$PREFIX/share/sigrok-dumps $V
 cd ..
 
 # sigrok-cli
@@ -170,17 +182,17 @@ $GIT_CLONE git://sigrok.org/sigrok-cli
 cd sigrok-cli
 ./autogen.sh
 ./configure $C
-make $PARALLEL V=1
-make install
+make $PARALLEL $V
+make install $V
 makensis -DHOME=$HOME contrib/sigrok-cli_cross.nsi
 cd ..
 
 # PulseView
 $GIT_CLONE git://sigrok.org/pulseview
 cd pulseview
-cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y .
-make $PARALLEL VERBOSE=1
-make install/strip
+cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_TESTS=y .
+make $PARALLEL $V
+make install/strip $V
 makensis -DHOME=$HOME contrib/pulseview_cross.nsi
 cd ..