X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=cross-compile%2Fmingw%2Fsigrok-cross-mingw;h=65887005b859dc334ad399010d79e098feb21c5f;hb=a2579d2045c6eab40472d24af127ca61ef88cacc;hp=1f2acd0958e4d2c9093be4cf851bb98530495d54;hpb=09ee3a4241e2e71d1901576d59d195ec8a64f90f;p=sigrok-util.git

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index 1f2acd0..6588700 100755
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -21,6 +21,9 @@
 
 set -e
 
+# Build target: "i686" (32bit) or "x86_64" (64bit).
+TARGET="i686"
+
 # The path where your MXE directory is located.
 MXE=$HOME/mxe-git
 
@@ -37,7 +40,6 @@ PARALLEL="-j 2"
 
 # -----------------------------------------------------------------------------
 
-VER_LIBUSB_WIN32=1.2.6.0
 VER_ZADIG=v2.0.1.160
 
 SF_MIRROR=switch.dl.sourceforge.net
@@ -50,12 +52,19 @@ GIT_CLONE="git clone --depth=1"
 # We need to find tools in the toolchain.
 export PATH=$MXE/usr/bin:$PATH
 
+TOOLCHAIN_TRIPLET="$TARGET-w64-mingw32.static"
+
 P="$PREFIX/lib/pkgconfig"
-P2="$MXE/usr/i686-pc-mingw32.static/lib/pkgconfig"
-C="--host=i686-pc-mingw32.static --prefix=$PREFIX"
-CM="-DCMAKE_TOOLCHAIN_FILE=$MXE/usr/i686-pc-mingw32.static/share/cmake/mxe-conf.cmake"
+P2="$MXE/usr/$TOOLCHAIN_TRIPLET/lib/pkgconfig"
+C="--host=$TOOLCHAIN_TRIPLET --prefix=$PREFIX"
+CM="-DCMAKE_TOOLCHAIN_FILE=$MXE/usr/$TOOLCHAIN_TRIPLET/share/cmake/mxe-conf.cmake"
 L="--disable-shared --enable-static"
-DDK="$MXE/usr/i686-pc-mingw32.static/include/ddk"
+
+if [ $TARGET == "i686" ]; then
+	export PKG_CONFIG_PATH_i686_w64_mingw32_static="$P:$P2"
+else
+	export PKG_CONFIG_PATH_x86_64_w64_mingw32_static="$P:$P2"
+fi
 
 # Remove build directory contents (if any) and create a new build dir.
 rm -rf $BUILDDIR
@@ -68,10 +77,12 @@ mkdir -p $PREFIX
 
 # 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
-# installer for Windows: http://python.org/ftp/python/3.2.3/python-3.2.3.msi.
+# installer for Windows:
+#   - https://www.python.org/ftp/python/3.2.3/python-3.2.3.msi
+#   - https://www.python.org/ftp/python/3.2.3/python-3.2.3.amd64.msi
 # The MSI file has been installed on a Windows box and then c:\Python32\libs
-# and c:\Python32\include have been stored in the Python32.tar.gz tarball.
-$WGET http://www.sigrok.org/tmp/Python32.tar.gz -O $PREFIX/Python32.tar.gz
+# and c:\Python32\include have been stored in the Python32_*.tar.gz tarball.
+$WGET http://www.sigrok.org/tmp/Python32_$TARGET.tar.gz -O $PREFIX/Python32.tar.gz
 tar xzf $PREFIX/Python32.tar.gz -C $PREFIX
 
 # Create a dummy python3.pc file so that pkg-config finds Python 3.
@@ -95,13 +106,8 @@ EOF
 # The file python32.zip contains all files from the 'DLLs', 'Lib', and 'libs'
 # subdirectories from an installed Python on Windows (c:\python32), i.e. some
 # libraries and all Python stdlib modules.
-$WGET http://www.sigrok.org/tmp/python32.dll -O $PREFIX/python32.dll
-$WGET http://www.sigrok.org/tmp/python32.zip -O $PREFIX/python32.zip
-
-# 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
+$WGET http://www.sigrok.org/tmp/python32_$TARGET.dll -O $PREFIX/python32.dll
+$WGET http://www.sigrok.org/tmp/python32_$TARGET.zip -O $PREFIX/python32.zip
 
 # Zadig (we ship this with frontends for easy driver switching).
 $WGET -c http://$SF_MIRROR/project/libwdi/zadig/zadig_$VER_ZADIG.7z
@@ -114,7 +120,7 @@ cp -f zadig.exe zadig_xp.exe $PREFIX
 $GIT_CLONE git://sigrok.org/libserialport
 cd libserialport
 ./autogen.sh
-PKG_CONFIG_PATH_i686_pc_mingw32_static=$P CFLAGS="-I$DDK" ./configure $C $L
+./configure $C $L
 make $PARALLEL V=1
 make install
 cd ..
@@ -124,7 +130,7 @@ $GIT_CLONE git://sigrok.org/libsigrok
 cd libsigrok
 patch -p1 < ../../libsigrok_firmwaredir.patch
 ./autogen.sh
-PKG_CONFIG_PATH_i686_pc_mingw32_static=$P ./configure $C $L
+./configure $C $L
 make $PARALLEL V=1
 make install
 cd ..
@@ -134,7 +140,7 @@ $GIT_CLONE git://sigrok.org/libsigrokdecode
 cd libsigrokdecode
 ./autogen.sh
 patch -p1 < ../../srd_decodersdir.patch
-PKG_CONFIG_PATH_i686_pc_mingw32_static=$P ./configure $C $L
+./configure $C $L
 make $PARALLEL V=1
 make install
 cd ..
@@ -168,7 +174,7 @@ cd ..
 $GIT_CLONE git://sigrok.org/sigrok-cli
 cd sigrok-cli
 ./autogen.sh
-PKG_CONFIG_PATH_i686_pc_mingw32_static=$P:$P2 ./configure $C
+./configure $C
 make $PARALLEL V=1
 make install
 makensis -DHOME=$HOME contrib/sigrok-cli_cross.nsi
@@ -177,7 +183,7 @@ cd ..
 # PulseView
 $GIT_CLONE git://sigrok.org/pulseview
 cd pulseview
-PKG_CONFIG_PATH_i686_pc_mingw32_static=$P:$P2 cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y .
+cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y .
 make $PARALLEL VERBOSE=1
 make install
 makensis -DHOME=$HOME contrib/pulseview_cross.nsi