X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmingw%2Fsigrok-cross-mingw;h=f553208d7ec118e6eddf96194f7a83531e942ff3;hp=9258796f1b623c38c027128fc79245f8d7fb5374;hb=5b7f0ad2d1170cc1362cd4a1da22c3bca8033033;hpb=91d4c754ac17525e2b515cde4bab3c5391c45c66

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index 9258796..f553208 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
 
@@ -28,11 +30,14 @@ PREFIX=$HOME/sr_mingw
 # The path where to download files to and where to build packages.
 BUILDDIR=./sr_mingw_build
 
+# Edit this to enable/disable/modify parallel compiles.
+PARALLEL="-j 2"
+
 # You usually don't need to change anything below this line.
 
 # -----------------------------------------------------------------------------
 
-VER_LIBUSB_1_0=1.0.9
+VER_LIBUSB_WIN32=1.2.6.0
 
 SF_MIRROR=switch.dl.sourceforge.net
 
@@ -54,13 +59,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
@@ -71,63 +69,95 @@ 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
+
+# libusb0.dll (needs to be shipped with frontends)
+wget -c http://$SF_MIRROR/project/libusb-win32/libusb-win32-releases/$VER_LIBUSB_WIN32/libusb-win32-bin-$VER_LIBUSB_WIN32.zip
+unzip libusb-win32-bin-$VER_LIBUSB_WIN32.zip
+cp -f libusb-win32-bin-$VER_LIBUSB_WIN32/bin/x86/libusb0_x86.dll $PREFIX/libusb0.dll
+
+# libserialport
+git clone git://sigrok.org/libserialport
+cd libserialport
+./autogen.sh
+PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L
+make $PARALLEL
+make install
+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 --disable-alsa --disable-link-mso19 && make install
+PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L
+make $PARALLEL
+make install
 cd ..
 
 # libsigrokdecode
 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 $PARALLEL
+make install
 cd ..
 
-# sigrok-cli
-git clone git://sigrok.org/sigrok-cli
-cd sigrok-cli
+# sigrok-firmware
+git clone git://sigrok.org/sigrok-firmware
+cd sigrok-firmware
 ./autogen.sh
-PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 ./configure $C && make install
+# Nothing gets cross-compiled here, we just need 'make install' basically.
+./configure --prefix=$PREFIX
+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
+# sigrok-firmware-fx2lafw
+git clone git://sigrok.org/sigrok-firmware-fx2lafw
+cd sigrok-firmware-fx2lafw
 ./autogen.sh
-PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 ./configure $C && make install
+# We're building the fx2lafw firmware on the host, no need to cross-compile.
+./configure --prefix=$PREFIX
+make $PARALLEL
+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 $PARALLEL
+make install
+makensis -DHOME=$HOME 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
+patch -p1 < ../../pulseview_linkfix.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 .
+make $PARALLEL VERBOSE=1
+make install
+makensis -DHOME=$HOME contrib/pulseview_cross.nsi
 cd ..