diff options
| author | kali <kali@win> | 2020-10-15 17:27:59 +0200 |
|---|---|---|
| committer | kali kaneko (leap communications) <kali@leap.se> | 2020-10-23 23:22:54 +0200 |
| commit | a540f3f4e5524b5daf813b0bb831707f58545d43 (patch) | |
| tree | 43f08367f5f61342359805f50de56332b1ea5212 /Makefile | |
| parent | 0176694cf5c418134a9eb183e021d03073065474 (diff) | |
[pkg] windows gui & installer fixes
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -73,11 +73,15 @@ EXTRA_FLAGS = endif ifeq ($(PLATFORM), windows) -EXTRA_GO_LDFLAGS = "-H windowsgui" +EXTRA_GO_LDFLAGS = "-H=windowsgui" endif - +ifeq ($(PLATFORM), windows) +PKGFILES = $(wildcard "pkg/*") # syntax err in windows with find +else PKGFILES = $(shell find pkg -type f -name '*.go') +endif + lib/%.a: $(PKGFILES) @./gui/build.sh --just-golib @@ -118,9 +122,9 @@ ifeq (${PLATFORM}, darwin) @cp -r "${QTBUILD}/release/${TARGET}.app"/ ${INST_DATA}/ endif ifeq (${PLATFORM}, windows) - @VERSION=${VERSION} ${SCRIPTS}/gen-qtinstaller windows ${INSTALLER} + @VERSION=${VERSION} VENDOR_PATH=${VENDOR_PATH} ${SCRIPTS}/gen-qtinstaller windows ${INSTALLER} @cp build/bin/${PLATFORM}/bitmask-helper ${INST_DATA}helper.exe - @cp branding/assets/${PROVIDER}/icon.ico ${INST_DATA}/icon.ico + @cp ${VENDOR_PATH}/${PROVIDER}/assets/icon.ico ${INST_DATA}/icon.ico @cp ${QTBUILD}/release/${TARGET}.exe ${INST_DATA}${TARGET}.exe # FIXME get the signed binaries with curl from openvpn downloads page - see if we have to adapt the openvpn-build to install tap drivers etc from our installer. @cp "/c/Program Files/OpenVPN/bin/openvpn.exe" ${INST_DATA} @@ -146,13 +150,13 @@ endif CROSS_WIN_FLAGS = CGO_ENABLED=1 GOARCH=386 GOOS=windows CC="/usr/bin/i686-w64-mingw32-gcc" CGO_LDFLAGS="-lssp" CXX="i686-w64-mingw32-c++" PLATFORM_WIN = PLATFORM=windows -EXTRA_LDFLAGS_WIN = EXTRA_LDFLAGS="-H windowsgui" +EXTRA_LDFLAGS_WIN = EXTRA_LDFLAGS="-H=windowsgui" build_cross_win: @echo "[+] Cross-building for windows..." @$(CROSS_WIN_FLAGS) $(PLATFORM_WIN) $(EXTRA_LDFLAGS_WIN) $(MAKE) _buildparts # workaround for helper: we use the go compiler @echo "[+] Compiling helper with the Go compiler to work around missing stdout bug..." - cd cmd/bitmask-helper && GOOS=windows GOARCH=386 go build -ldflags "-X main.version=`git describe --tags` -H windowsgui" -o ../../build/bin/windows/bitmask-helper-go + cd cmd/bitmask-helper && GOOS=windows GOARCH=386 go build -ldflags "-X main.version=`git describe --tags` -H=windowsgui" -o ../../build/bin/windows/bitmask-helper-go CROSS_OSX_FLAGS = MACOSX_DEPLOYMENT_TARGET=10.10 CGO_ENABLED=1 GOOS=darwin CC="o64-clang" PLATFORM_OSX = PLATFORM=darwin |