X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=cross-compile%2Fmingw%2Fsigrok-cross-mingw;h=8b30158cf38baa612349e969e850ea6c041f10f0;hb=4acee7ed4c5554ac981730433d6253269a16b7b6;hp=16be9973151d41a1e53031f180cfb320d981834c;hpb=5d7aeed5d68238f4bcae4b1c2ac0325ac629f039;p=sigrok-util.git

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index 16be997..8b30158 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"
 
@@ -40,11 +43,9 @@ PARALLEL="-j 2"
 
 # -----------------------------------------------------------------------------
 
-VER_ZADIG=v2.0.1.160
-
 SF_MIRROR=switch.dl.sourceforge.net
 
-WGET="wget --quiet"
+WGET="wget -c --quiet"
 GIT_CLONE="git clone --depth=1"
 
 # -----------------------------------------------------------------------------
@@ -52,18 +53,18 @@ GIT_CLONE="git clone --depth=1"
 # We need to find tools in the toolchain.
 export PATH=$MXE/usr/bin:$PATH
 
-TOOLCHAIN_TRIPLET="$TARGET-w64-mingw32.static"
+TOOLCHAIN_TRIPLET="$TARGET-w64-mingw32.static.posix"
 
 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
-	export PKG_CONFIG_PATH_i686_w64_mingw32_static="$P:$P2"
+if [ $TARGET = "i686" ]; then
+	export PKG_CONFIG_PATH_i686_w64_mingw32_static_posix="$P:$P2"
 else
-	export PKG_CONFIG_PATH_x86_64_w64_mingw32_static="$P:$P2"
+	export PKG_CONFIG_PATH_x86_64_w64_mingw32_static_posix="$P:$P2"
 fi
 
 # Remove build directory contents (if any) and create a new build dir.
@@ -110,39 +111,43 @@ $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
 
 # 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
+$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
 $GIT_CLONE git://sigrok.org/libsigrok
 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
 $GIT_CLONE git://sigrok.org/libsigrokdecode
 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
@@ -151,7 +156,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
@@ -160,14 +165,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
@@ -175,17 +180,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 ..