X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmingw%2Fsigrok-cross-mingw;fp=cross-compile%2Fmingw%2Fsigrok-cross-mingw;h=8e5a61831b2ee7c696d7645679eece0b29e1d1c3;hp=c5c3a39af91d9473ac93452c72295c2231a0aed4;hb=35783694c625b8aa3fa641ab752650313f9ad658;hpb=abc4a7629e15e5a76e58a644371cc1e4a9822baa

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index c5c3a39..8e5a618 100755
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -120,6 +120,19 @@ EOF
 $WGET http://www.sigrok.org/tmp/python34_$TARGET.dll -O $PREFIX/python34.dll
 $WGET http://www.sigrok.org/tmp/python34_$TARGET.zip -O $PREFIX/python34.zip
 
+# In order to link against Python we need libpython34.a.
+# The upstream Python 32bit installer ships this, the x86_64 installer
+# doesn't. Thus, we generate the file manually here.
+if [ $TARGET = "x86_64" ]; then
+	cp $PREFIX/python34.dll .
+	$MXE/usr/$TARGET-w64-mingw32.static.posix/bin/gendef python34.dll
+	$MXE/usr/bin/$TARGET-w64-mingw32.static.posix-dlltool \
+		--dllname python34.dll --def python34.def \
+		--output-lib libpython34.a
+	mv -f libpython34.a $PREFIX/Python34/libs
+	rm -f python34.dll
+fi
+
 # 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