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

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index e3bc71f..c86ada2 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
 
@@ -26,14 +28,26 @@ 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"
 
 # You usually don't need to change anything below this line.
 
 # -----------------------------------------------------------------------------
 
-# We need to find tools in the toolchain and in the install directory.
-export PATH=$PREFIX/bin:$MXE/usr/bin:$PATH
+VER_LIBUSB_WIN32=1.2.6.0
+VER_ZADIG=v2.0.1.160
+
+SF_MIRROR=switch.dl.sourceforge.net
+
+WGET="wget --quiet"
+
+# -----------------------------------------------------------------------------
+
+# 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"
@@ -55,65 +69,110 @@ cd $BUILDDIR
 # The MSI file has been installed on a Windows box and then the c:\Python32
 # files have been stored in the Python32.tar.gz tarball.
 mkdir -p $PREFIX
-wget http://www.sigrok.org/tmp/Python32.tar.gz -O $PREFIX/Python32.tar.gz
+$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
+$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 -q libusb-win32-bin-$VER_LIBUSB_WIN32.zip
+cp -f libusb-win32-bin-$VER_LIBUSB_WIN32/bin/x86/libusb0_x86.dll $PREFIX/libusb0.dll
+
+# Zadig (we ship this with frontends for easy driver switching).
+$WGET -c http://$SF_MIRROR/project/libwdi/zadig/zadig_$VER_ZADIG.7z
+$WGET -c http://$SF_MIRROR/project/libwdi/zadig/zadig_xp_$VER_ZADIG.7z
+7zr e zadig_$VER_ZADIG.7z
+7zr e zadig_xp_$VER_ZADIG.7z
+cp -f zadig.exe zadig_xp.exe $PREFIX
 
 # libserialport
 git clone git://sigrok.org/libserialport
 cd libserialport
 ./autogen.sh
-PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L && make install
+PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L
+make $PARALLEL V=1
+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 && make install
+PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L
+make $PARALLEL V=1
+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 V=1
+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 $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
+patch -p1 < ../../sigrok_cli_decodersdir.patch
 ./autogen.sh
-PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 ./configure $C && make install
-makensis contrib/sigrok-cli_cross.nsi
+PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 ./configure $C
+make $PARALLEL V=1
+make install
+makensis -DHOME=$HOME contrib/sigrok-cli_cross.nsi
 cd ..
 
 # PulseView
 git clone git://sigrok.org/pulseview
 cd pulseview
-# 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
+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_TESTS=y .
+make $PARALLEL VERBOSE=1
+make install
+makensis -DHOME=$HOME contrib/pulseview_cross.nsi
 cd ..