X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmingw%2Fsigrok-cross-mingw;h=b38a111f3413e078c5a0d87e97f0de61e7c45178;hp=e3fd6f41871354416f605632399f938ca84172d1;hb=22838903fe2a494ef00e67f2428bce0c1ac63cc4;hpb=6cc41785239777c83f5b8d02307ea4b43457d946

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index e3fd6f4..b38a111 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
 
 # -----------------------------------------------------------------------------
 
-SF_MIRROR=switch.dl.sourceforge.net
-
-VER_LIBUSBX=1.0.17
-
-# -----------------------------------------------------------------------------
-
 # We need to find tools in the toolchain and in the install directory.
 export PATH=$PREFIX/bin:$MXE/usr/bin:$PATH
 
@@ -85,13 +81,6 @@ chmod 755 $PREFIX/bin/python3-config
 wget -c http://python.org/ftp/python/3.2.3/python-3.2.3.msi \
      -O $PREFIX/python-3.2.3.msi
 
-# libusbx
-wget http://$SF_MIRROR/project/libusbx/releases/$VER_LIBUSBX/source/libusbx-$VER_LIBUSBX.tar.bz2
-tar xfj libusbx-$VER_LIBUSBX.tar.bz2
-cd libusbx-$VER_LIBUSBX
-PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L && make install
-cd ..
-
 # libserialport
 git clone git://sigrok.org/libserialport
 cd libserialport
@@ -124,7 +113,7 @@ cd ..
 # PulseView
 git clone git://sigrok.org/pulseview
 cd pulseview
-patch -p1 < ../../pulseview.patch
+patch -p1 < ../../pulseview_linkfix.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 ..