diff options
| author | kali kaneko (leap communications) <kali@leap.se> | 2020-10-23 17:12:02 +0200 |
|---|---|---|
| committer | kali kaneko (leap communications) <kali@leap.se> | 2020-10-23 23:24:49 +0200 |
| commit | 05398d4f961406f888c325504610430267bfdb47 (patch) | |
| tree | ab105821d010f8d4b5ae7478b513ba7dd3319aaf | |
| parent | 496df8085f2256a72ab7d4b3c32e56933597e0e6 (diff) | |
[pkg] relink vendor assets
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | bitmask.pro | 1 | ||||
| -rw-r--r-- | providers/vendor.qrc | 5 |
4 files changed, 16 insertions, 2 deletions
@@ -18,6 +18,7 @@ tools/transifex/transifex branding/assets/default lib/* qtbuild/* +providers/assets .*.swp *.exe @@ -3,7 +3,7 @@ # (c) LEAP Encryption Access Project, 2019-2020 ######################################################################### -.PHONY: all get build icon locales generate_locales clean check_qtifw HAS-qtifw +.PHONY: all get build icon locales generate_locales clean check_qtifw HAS-qtifw relink_vendor XBUILD ?= no SKIP_CACHECK ?= no @@ -45,6 +45,7 @@ HAS_QTIFW := $(shell PATH=$(PATH) which binarycreator) endif OPENVPN_BIN = "$(HOME)/openvpn_build/sbin/$(shell grep OPENVPN branding/thirdparty/openvpn/build_openvpn.sh | head -n 1 | cut -d = -f 2 | tr -d '"')" + ######################################################################### # go build ######################################################################### @@ -87,9 +88,15 @@ endif lib/%.a: $(PKGFILES) @./gui/build.sh --just-golib +relink_vendor: +ifeq ($(VENDOR_PATH), providers) + @unlink providers/assets || true + @ln -s ${PROVIDER}/assets providers/assets +endif + build_golib: lib/libgoshim.a -build_gui: +build_gui: relink_vendor @XBUILD=no TARGET=${TARGET} VENDOR_PATH=${VENDOR_PATH} gui/build.sh --skip-golib build: build_golib build_helper build_gui diff --git a/bitmask.pro b/bitmask.pro index 1601b46..22c3d7f 100644 --- a/bitmask.pro +++ b/bitmask.pro @@ -7,6 +7,7 @@ lessThan(QT_MAJOR_VERSION, 5): error("requires Qt 5") QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11 !defined(VENDOR_PATH, var):VENDOR_PATH="providers/riseup" + message("[qmake] VENDOR_PATH: $$VENDOR_PATH") RESOURCES += gui/gui.qrc diff --git a/providers/vendor.qrc b/providers/vendor.qrc new file mode 100644 index 0000000..2cfa32b --- /dev/null +++ b/providers/vendor.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/vendor/"> + <file alias="icon.svg">assets/icon.svg</file> + </qresource> +</RCC> |