sigrok-cross-mingw: Drop obsolete -DHOME parameter for makensis.

[sigrok-util.git] / cross-compile / mingw / sigrok-cross-mingw

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index 300364558f1de8d594c2dbb61158ce2c8e1636c7..c6d95d3534340aa8614b163ada0b949b15a12bf7 100755 (executable)
--- 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
@@ -193,12 +206,13 @@ cd sigrok-cli
 ./configure $C
 make $PARALLEL $V
 make install $V
-makensis -DHOME=$HOME contrib/sigrok-cli_cross.nsi
+makensis contrib/sigrok-cli_cross.nsi
 cd ..
 
 # PulseView
 $GIT_CLONE $REPO_BASE/pulseview
 cd pulseview
+cp ../../FileAssociation.nsh contrib
 if [ $DEBUG = 1 ]; then
        # Allow a "DOS box" to open on Windows, it'll contain logging output.
        patch -p1 < ../../pv_mwindows.patch
@@ -210,6 +224,6 @@ if [ $DEBUG = 1 ]; then
 else
        make install/strip $V
 fi
-makensis -DHOME=$HOME contrib/pulseview_cross.nsi
+makensis contrib/pulseview_cross.nsi
 cd ..