X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmingw%2Fsigrok-cross-mingw;h=c86ada2bf8ecf4c987f4f6c3d0f7b156cc05848e;hp=be20756e1e164a2f7b16c8d41db8104075fdffd9;hb=b73b66ae6fd458b56461b47837cb6fea4bbfc491;hpb=37d3fad3ed5bba7188b99d45e38bef80b11a5a3b

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index be20756..c86ada2 100755
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -28,7 +28,7 @@ MXE=$HOME/mxe-git
 PREFIX=$HOME/sr_mingw
 
 # The path where to download files to and where to build packages.
-BUILDDIR=./sr_mingw_build
+BUILDDIR=./build
 
 # Edit this to enable/disable/modify parallel compiles.
 PARALLEL="-j 2"
@@ -42,10 +42,12 @@ 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.
-export PATH=$PREFIX/bin:$MXE/usr/bin:$PATH
+# We need to find tools in the toolchain.
+export PATH=$MXE/usr/bin:$PATH
 
 P="$PREFIX/lib/pkgconfig"
 P2="$MXE/usr/i686-pc-mingw32/lib/pkgconfig"
@@ -67,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.
@@ -85,17 +87,17 @@ 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
+$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
@@ -105,7 +107,7 @@ 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 ..
 
@@ -115,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 ..
 
@@ -124,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 ..
 
@@ -143,17 +145,23 @@ 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 ..
 
+# sigrok-dumps
+git clone git://sigrok.org/sigrok-dumps
+cd sigrok-dumps
+make install DESTDIR=$PREFIX/share/sigrok-dumps
+cd ..
+
 # sigrok-cli
 git clone git://sigrok.org/sigrok-cli
 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 ..
@@ -161,8 +169,8 @@ cd ..
 # PulseView
 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 .
+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 -DENABLE_TESTS=y .
 make $PARALLEL VERBOSE=1
 make install
 makensis -DHOME=$HOME contrib/pulseview_cross.nsi