diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2019-03-22 09:38:41 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2019-03-22 09:38:41 -0700 |
| commit | af3ec000a00d6054006dce7f5cc21bb352358df7 (patch) | |
| tree | a41e0ca3814486724b5b51450319ac3fbb8bb11a | |
| parent | 8051127c3b8b25b9246f9da7693c54e8be07d267 (diff) | |
| parent | af60e769b0c3ec837170e7284c13a75a735495c8 (diff) | |
| download | infinitytier-af3ec000a00d6054006dce7f5cc21bb352358df7.tar.gz infinitytier-af3ec000a00d6054006dce7f5cc21bb352358df7.zip | |
Merge branch 'dev' into edge
| -rw-r--r-- | make-mac.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/make-mac.mk b/make-mac.mk index 57c69886..0735a47f 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -21,6 +21,11 @@ DEFS+=-DZT_BUILD_PLATFORM=$(ZT_BUILD_PLATFORM) -DZT_BUILD_ARCHITECTURE=$(ZT_BUIL include objects.mk ONE_OBJS+=osdep/MacEthernetTap.o ext/http-parser/http_parser.o +ifeq ($(ZT_CONTROLLER),1) + LIBS+=-lpq -lrabbitmq + DEFS+=-DZT_CONTROLLER_USE_LIBPQ -DZT_CONTROLLER +endif + # Official releases are signed with our Apple cert and apply software updates by default ifeq ($(ZT_OFFICIAL_RELEASE),1) DEFS+=-DZT_SOFTWARE_UPDATE_DEFAULT="\"apply\"" @@ -58,7 +63,7 @@ ifeq ($(ZT_DEBUG),1) node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CFLAGS = -Wall -O2 -g $(INCLUDES) $(DEFS) else CFLAGS?=-Ofast -fstack-protector-strong - CFLAGS+=$(ARCH_FLAGS) -Wall -Werror -flto -fPIE -mmacosx-version-min=10.7 -DNDEBUG -Wno-unused-private-field $(INCLUDES) $(DEFS) + CFLAGS+=$(ARCH_FLAGS) -Wall -flto -fPIE -mmacosx-version-min=10.7 -DNDEBUG -Wno-unused-private-field $(INCLUDES) $(DEFS) STRIP=strip endif @@ -91,6 +96,9 @@ one: $(CORE_OBJS) $(ONE_OBJS) one.o mac-agent zerotier-one: one +central-controller: + make ZT_CONTROLLER=1 one + zerotier-idtool: one zerotier-cli: one |