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

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index 33da4cb..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"
@@ -46,8 +46,8 @@ 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"
@@ -149,6 +149,12 @@ 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
@@ -163,9 +169,8 @@ cd ..
 # PulseView
 git clone git://sigrok.org/pulseview
 cd pulseview
-patch -p1 < ../../pulseview_linkfix.patch
 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_COTIRE=y .
+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