From: xorloser <redacted>
Date: Thu, 10 Sep 2020 05:30:23 +0000 (+1000)
Subject: sigrok-cross-mingw: Fix for installing 64bit programs into 'Program Files'
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=1087c2834dc7fbad13b0bae98c8887f42f570841;p=sigrok-util.git

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

This fixes bug #1082.
---

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index c3bb9dd..52895b7 100755
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -215,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
@@ -235,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 ..