summaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorkali <kali@win>2020-10-15 22:03:54 +0200
committerkali kaneko (leap communications) <kali@leap.se>2020-10-23 23:22:57 +0200
commit015faa8fe70912da4faa1528c88c3ef6b9fcaabd (patch)
tree4f0086db3d4ab2242e171a08248529276a0e0422 /gui
parent46f84b7490e0427fc2ddd20238797d1d7523e278 (diff)
[pkg] windows vendoring fixes
Diffstat (limited to 'gui')
-rwxr-xr-xgui/build.sh9
1 files changed, 5 insertions, 4 deletions
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