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

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index e3fd6f4..5b739bd 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
 
@@ -64,34 +60,24 @@ mkdir -p $PREFIX
 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-config that points to Python32 above.
-mkdir -p $PREFIX/bin
-cat >$PREFIX/bin/python3-config <<EOF 
-#!/usr/bin/python3
-import sys
-import getopt
-valid_opts = ['includes', 'cflags', 'libs', 'ldflags']
-opts, args = getopt.getopt(sys.argv[1:], '', valid_opts)
-opt_flags = [flag for (flag, val) in opts]
-for opt in opt_flags: 
-    if opt in ('--includes', '--cflags'):
-        print('-I$PREFIX/Python32/include')
-    elif opt in ('--libs', '--ldflags'):
-        print('-L$PREFIX/Python32/libs -lpython32')
+# Create a dummy python3.pc file so that pkg-config finds Python 3.
+mkdir -p $PREFIX/lib/pkgconfig
+cat >$PREFIX/lib/pkgconfig/python3.pc <<EOF 
+prefix=$PREFIX
+exec_prefix=\${prefix}
+libdir=\${exec_prefix}/lib
+includedir=\${prefix}/include
+Name: Python
+Description: Python library
+Version: 3.2
+Libs: -L$PREFIX/Python32/libs -lpython32
+Cflags: -I$PREFIX/Python32/include
 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
 
-# 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
@@ -102,6 +88,7 @@ cd ..
 # libsigrok
 git clone git://sigrok.org/libsigrok
 cd libsigrok
+patch -p1 < ../../libsigrok_firmwaredir.patch
 ./autogen.sh
 PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L && make install
 cd ..
@@ -110,12 +97,32 @@ cd ..
 git clone git://sigrok.org/libsigrokdecode
 cd libsigrokdecode
 ./autogen.sh
-PYTHON3_CONFIG=$PREFIX/bin/python3-config PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L && make install
+PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L && make install
+cd ..
+
+# sigrok-firmware
+git clone git://sigrok.org/sigrok-firmware
+cd sigrok-firmware
+./autogen.sh
+# Nothing gets cross-compiled here, we just need 'make install' basically.
+./configure --prefix=$PREFIX
+make install
+cd ..
+
+# sigrok-firmware-fx2lafw
+git clone git://sigrok.org/sigrok-firmware-fx2lafw
+cd sigrok-firmware-fx2lafw
+./autogen.sh
+# We're building the fx2lafw firmware on the host, no need to cross-compile.
+./configure --prefix=$PREFIX
+make
+make install
 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 install
 makensis -DHOME=$HOME contrib/sigrok-cli_cross.nsi
@@ -124,8 +131,9 @@ cd ..
 # PulseView
 git clone git://sigrok.org/pulseview
 cd pulseview
-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
+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 . && make install VERBOSE=1
 makensis -DHOME=$HOME contrib/pulseview_cross.nsi
 cd ..