diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-03-09 07:51:43 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-03-09 07:51:43 -0800 |
| commit | b601041b5bd82aca1e52967c37c78ed953be7751 (patch) | |
| tree | dff8037ee8cb26cfcb6dfd4de8eb037d85a832e8 /make-mac.mk | |
| parent | 0945d6ec0d7b94ba76b5f9490540d35212d21763 (diff) | |
| parent | e61d4ab67ae1a79debccd58910bbe1779780d95d (diff) | |
| download | infinitytier-b601041b5bd82aca1e52967c37c78ed953be7751.tar.gz infinitytier-b601041b5bd82aca1e52967c37c78ed953be7751.zip | |
Merge branch 'edge' of http://10.6.6.2/zerotier/ZeroTierOne into edge
Diffstat (limited to 'make-mac.mk')
| -rw-r--r-- | make-mac.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/make-mac.mk b/make-mac.mk index 60aa465a..1178437a 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -63,6 +63,11 @@ ifeq ($(ZT_TRACE),1) DEFS+=-DZT_TRACE endif +ifeq ($(ZT_VAULT_SUPPORT),1) + DEFS+=-DZT_VAULT_SUPPORT=1 + LIBS+=-lcurl +endif + CXXFLAGS=$(CFLAGS) -std=c++11 -stdlib=libc++ all: one macui @@ -70,7 +75,7 @@ all: one macui ext/x64-salsa2012-asm/salsa2012.o: $(CC) $(CFLAGS) -c ext/x64-salsa2012-asm/salsa2012.s -o ext/x64-salsa2012-asm/salsa2012.o -one: $(CORE_OBJS) $(ONE_OBJS) one.o +one: $(CORE_OBJS) $(ONE_OBJS) one.o $(CXX) $(CXXFLAGS) -o zerotier-one $(CORE_OBJS) $(ONE_OBJS) one.o $(LIBS) $(STRIP) zerotier-one ln -sf zerotier-one zerotier-idtool |