Skip to content
Snippets Groups Projects
Unverified Commit 05398d4f authored by Kali Kaneko's avatar Kali Kaneko
Browse files

[pkg] relink vendor assets

parent 496df808
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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
......
<RCC>
<qresource prefix="/vendor/">
<file alias="icon.svg">assets/icon.svg</file>
</qresource>
</RCC>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment