X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmingw%2Fsigrok-cross-mingw;h=e401ab3441231d130a73d0bc152a24c160b3855c;hp=e09be7d29cac8bc997e8911f5322c45b7930597b;hb=b5f5503403d21d170f7a3cae40f3a7e3646951b2;hpb=cf28c06c9be1abda969f738afd48c592eb8c99b9

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index e09be7d..e401ab3 100755
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -19,6 +19,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
+set -e
+
 # The path where your MXE directory is located.
 MXE=$HOME/mxe-git
 
@@ -32,12 +34,6 @@ BUILDDIR=./sr_mingw_build
 
 # -----------------------------------------------------------------------------
 
-VER_LIBUSB_1_0=1.0.9
-
-SF_MIRROR=switch.dl.sourceforge.net
-
-# -----------------------------------------------------------------------------
-
 # We need to find tools in the toolchain and in the install directory.
 export PATH=$PREFIX/bin:$MXE/usr/bin:$PATH
 
@@ -54,13 +50,6 @@ cd $BUILDDIR
 
 # -----------------------------------------------------------------------------
 
-# libusb-1.0
-wget http://$SF_MIRROR/project/libusb/libusb-1.0/libusb-$VER_LIBUSB_1_0/libusb-$VER_LIBUSB_1_0.tar.bz2
-tar xfj libusb-$VER_LIBUSB_1_0.tar.bz2
-cd libusb-$VER_LIBUSB_1_0
-./configure $C $L && make install
-cd ..
-
 # Python3
 # Cross-compiling Python is highly non-trivial, so we avoid it for now.
 # The download below is a repackaged tarball of the official Python 3.2.3 MSI
@@ -88,6 +77,17 @@ for opt in opt_flags:
 EOF
 chmod 755 $PREFIX/bin/python3-config
 
+# 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
+
+# libserialport
+git clone git://sigrok.org/libserialport
+cd libserialport
+./autogen.sh
+PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L && make install
+cd ..
+
 # libsigrok
 git clone git://sigrok.org/libsigrok
 cd libsigrok
@@ -107,28 +107,14 @@ git clone git://sigrok.org/sigrok-cli
 cd sigrok-cli
 ./autogen.sh
 PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 ./configure $C && make install
+makensis -DHOME=$HOME contrib/sigrok-cli_cross.nsi
 cd ..
 
-## TODO: Doesn't fully work, yet.
-## # sigrok-qt
-## git clone git://sigrok.org/sigrok-qt
-## cd sigrok-qt
-## PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 qmake -spec win32-g++
-## make
-## # TODO: make install
-## cd ..
-
-# # sigrok-gtk
-# git clone git://sigrok.org/sigrok-gtk
-# cd sigrok-gtk
-# ./autogen.sh
-# PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 ./configure $C && make install
-# cd ..
-
 # PulseView
 git clone git://sigrok.org/pulseview
 cd pulseview
-# TODO: Append (not prepend) "-llzma -llcms" to the linker.
+patch -p1 < ../../pulseview.patch
 PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y . && make install VERBOSE=1
+makensis -DHOME=$HOME contrib/pulseview_cross.nsi
 cd ..