From 015faa8fe70912da4faa1528c88c3ef6b9fcaabd Mon Sep 17 00:00:00 2001
From: kali <kali@win>
Date: Thu, 15 Oct 2020 22:03:54 +0200
Subject: [pkg] windows vendoring fixes

---
 gui/build.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'gui')

diff --git a/gui/build.sh b/gui/build.sh
index c3d1699..2262d09 100755
--- a/gui/build.sh
+++ b/gui/build.sh
@@ -6,6 +6,8 @@ set -e
 # --------------------
 
 XBUILD=${XBUILD-no}
+VENDOR_PATH=${VENDOR_PATH-providers/riseup}
+
 OSX_TARGET=10.11
 WIN64="win64"
 GO=`which go`
@@ -16,7 +18,6 @@ SOURCE_GOLIB=gui/backend.go
 
 QTBUILD=build/qt
 RELEASE=$QTBUILD/release
-VENDOR_PATH=${VENDOR_PATH-providers/riseup}
 
 PLATFORM=$(uname -s)
 LDFLAGS=""
@@ -58,7 +59,7 @@ function buildGoLib {
     fi
     if [ "$PLATFORM" == "MINGW64_NT-10.0" ]
     then
-	LDFLAGS="-H=windowsgui"
+	LDFLAGS="-H windowsgui"
     fi
     if [ "$XBUILD" == "no" ]
     then
@@ -76,9 +77,8 @@ function buildGoLib {
 function buildQmake {
     echo "[+] Now building Qml app with Qt qmake"
     echo "[+] Using qmake in:" $QMAKE
-    echo "[+] VENDOR_PATH:" $VENDOR_PATH
     mkdir -p $QTBUILD
-    $QMAKE -o $QTBUILD/Makefile "CONFIG-=debug CONFIG+=release VENDOR_PATH=${VENDOR_PATH}" $PROJECT
+    $QMAKE -o "$QTBUILD/Makefile" CONFIG-=debug CONFIG+=release VENDOR_PATH=${VENDOR_PATH} $PROJECT
 }
 
 function renameOutput {
@@ -118,6 +118,7 @@ function buildDefault {
 }
 
 
+echo "[build.sh] VENDOR_PATH =" ${VENDOR_PATH}
 for i in "$@"
 do
 case $i in
-- 
cgit v1.2.3