X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmingw%2Fsigrok-cross-mingw;h=52895b7019cf83866820fc2b695a82f46d467ed5;hp=bae165f0a2d4045761aaf887c236f3b03b7ed997;hb=1087c2834dc7fbad13b0bae98c8887f42f570841;hpb=682d505b8b7d354c7b0dc1bd719a4f43e0f566c7

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index bae165f..52895b7 100755
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -2,7 +2,7 @@
 ##
 ## This file is part of the sigrok-util project.
 ##
-## Copyright (C) 2013-2017 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2013-2020 Uwe Hermann <uwe@hermann-uwe.de>
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -26,11 +26,11 @@ TARGET="i686"
 # The path where your MXE directory is located.
 MXE=$HOME/mxe-git
 
-# The path where the cross-compiled packages will be installed.
-PREFIX=$HOME/sr_mingw
+# The base path prefix where the cross-compiled packages will be installed.
+PREFIXBASE=$HOME/sr_mingw
 
-# The path where to download files to and where to build packages.
-BUILDDIR=./build
+# The base path prefix where to download files to and where to build packages.
+BUILDBASE=./build
 
 # Edit this to control verbose build output.
 # V="V=1 VERBOSE=1"
@@ -45,13 +45,28 @@ DEBUG=0
 
 # -----------------------------------------------------------------------------
 
-SF_MIRROR=switch.dl.sourceforge.net
-
 WGET="wget -c --quiet"
 GIT_CLONE="git clone --depth=1"
 
 REPO_BASE="git://sigrok.org"
 
+# Construct the build and install directory pathnames.
+if [ $TARGET = "i686" ]; then
+	SUFFIX="32"
+else
+	SUFFIX="64"
+fi
+if [ $DEBUG = 1 ]; then
+	# CFLAGS/CXXFLAGS contains "-g" per default for autotools projects.
+	BUILD_TYPE="Debug"
+	PREFIX=$PREFIXBASE"_debug_"$SUFFIX
+	BUILDDIR=$BUILDBASE"_debug_"$SUFFIX
+else
+	BUILD_TYPE="Release"
+	PREFIX=$PREFIXBASE"_release_"$SUFFIX
+	BUILDDIR=$BUILDBASE"_release_"$SUFFIX
+fi
+
 # -----------------------------------------------------------------------------
 
 # We need to find tools in the toolchain.
@@ -72,13 +87,6 @@ else
 	export PKG_CONFIG_PATH_x86_64_w64_mingw32_static_posix="$P:$P2"
 fi
 
-if [ $DEBUG = 1 ]; then
-	# CFLAGS/CXXFLAGS contains "-g" per default for autotools projects.
-	BUILD_TYPE="Debug"
-else
-	BUILD_TYPE="Release"
-fi
-
 # Remove build directory contents (if any) and create a new build dir.
 rm -rf $BUILDDIR
 mkdir $BUILDDIR
@@ -98,6 +106,11 @@ mkdir -p $PREFIX
 $WGET http://www.sigrok.org/tmp/Python34_$TARGET.tar.gz -O $PREFIX/Python34.tar.gz
 tar xzf $PREFIX/Python34.tar.gz -C $PREFIX
 
+# Fix for bug #1195.
+if [ $TARGET = "x86_64" ]; then
+	patch -p1 $PREFIX/Python34/include/pyconfig.h < ../pyconfig.patch
+fi
+
 # 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 
@@ -135,19 +148,13 @@ if [ $TARGET = "x86_64" ]; then
 	rm -f python34.dll
 fi
 
+# We need to include the *.pyd files from python34.zip into the installers,
+# otherwise importing certain modules (e.g. ctypes) won't work (bug #1409).
+unzip -q $PREFIX/python34.zip *.pyd -d $PREFIX
+
 # Zadig (we ship this with frontends for easy driver switching).
-$WGET http://zadig.akeo.ie/downloads/zadig.exe -O $PREFIX/zadig.exe
-$WGET http://zadig.akeo.ie/downloads/zadig_xp.exe -O $PREFIX/zadig_xp.exe
-
-# libusb
-$GIT_CLONE git://github.com/dickens/libusb -b event-abstraction-v4
-cd libusb
-patch -p1 < ../../libusb_raw_io.patch
-./bootstrap.sh
-./configure $C $L
-make -j1 $V
-make install $V
-cd ..
+$WGET https://github.com/pbatard/libwdi/releases/download/b721/zadig-2.4.exe -O $PREFIX/zadig.exe
+$WGET https://github.com/pbatard/libwdi/releases/download/v1.2.5/zadig_xp-2.2.exe -O $PREFIX/zadig_xp.exe
 
 # libserialport
 $GIT_CLONE $REPO_BASE/libserialport
@@ -208,7 +215,11 @@ cd sigrok-cli
 ./configure $C
 make $PARALLEL $V
 make install $V
-makensis contrib/sigrok-cli_cross.nsi
+if [ $TARGET = "i686" ]; then
+	makensis contrib/sigrok-cli_cross.nsi
+else
+	makensis -DPE64=1 contrib/sigrok-cli_cross.nsi
+fi
 cd ..
 
 # PulseView
@@ -219,14 +230,19 @@ $CMAKE \
 	-DCMAKE_INSTALL_PREFIX:PATH=$PREFIX \
 	-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
 	-DDISABLE_WERROR=y \
-	-DENABLE_TESTS=y
+	-DENABLE_TESTS=y \
 	.
 make $PARALLEL $V
+make manual
 if [ $DEBUG = 1 ]; then
 	make install $V
 else
 	make install/strip $V
 fi
-makensis contrib/pulseview_cross.nsi
+if [ $TARGET = "i686" ]; then
+	makensis contrib/pulseview_cross.nsi
+else
+	makensis -DPE64=1 contrib/pulseview_cross.nsi
+fi
 cd ..