sigrok-cross-mingw: Fix for installing 64bit programs into 'Program Files'

[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 bda4d921240d6f6cacf130dc6bd9e47c9e493e01..52895b7019cf83866820fc2b695a82f46d467ed5 100755 (executable)
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -156,16 +156,6 @@ unzip -q $PREFIX/python34.zip *.pyd -d $PREFIX
 $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
 
-# 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 ..
-
 # libserialport
 $GIT_CLONE $REPO_BASE/libserialport
 cd libserialport
@@ -225,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
@@ -245,6 +239,10 @@ if [ $DEBUG = 1 ]; then
 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 ..