X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmingw%2Fsigrok-cross-mingw;h=aca0721ff4219118da1d56474086fc28c918180e;hp=059027b47b2f4c422775a472ffb2abdfb195a3b4;hb=5b9f0cfce00d2b61855827e82dd36a322a502283;hpb=eb5279c70c2d7602d10ff15721ce276c3adc787e

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index 059027b..aca0721 100755
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -32,12 +32,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 +48,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 +75,10 @@ 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
+
 # libsigrok
 git clone git://sigrok.org/libsigrok
 cd libsigrok
@@ -107,27 +98,15 @@ git clone git://sigrok.org/sigrok-cli
 cd sigrok-cli
 ./autogen.sh
 PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 ./configure $C && make install
-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
+makensis contrib/sigrok-cli_cross.nsi
 cd ..
 
 # PulseView
 git clone git://sigrok.org/pulseview
 cd pulseview
-LDFLAGS="-llzma -llcms" PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX . && make install
+# Temporary workaround: append (not prepend) "-llzma -llcms2" to the linker.
+sed -i '247a \\tlist(APPEND PULSEVIEW_LINK_LIBS "-llzma -llcms2") # Quick hack' CMakeLists.txt
+PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y . && make install VERBOSE=1
+makensis contrib/pulseview_cross.nsi
 cd ..