|
@@ -21,6 +21,11 @@ DEFS+=-DZT_BUILD_PLATFORM=$(ZT_BUILD_PLATFORM) -DZT_BUILD_ARCHITECTURE=$(ZT_BUIL
|
|
|
include objects.mk
|
|
include objects.mk
|
|
|
ONE_OBJS+=osdep/MacEthernetTap.o ext/http-parser/http_parser.o
|
|
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
|
|
# Official releases are signed with our Apple cert and apply software updates by default
|
|
|
ifeq ($(ZT_OFFICIAL_RELEASE),1)
|
|
ifeq ($(ZT_OFFICIAL_RELEASE),1)
|
|
|
DEFS+=-DZT_SOFTWARE_UPDATE_DEFAULT="\"apply\""
|
|
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)
|
|
node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CFLAGS = -Wall -O2 -g $(INCLUDES) $(DEFS)
|
|
|
else
|
|
else
|
|
|
CFLAGS?=-Ofast -fstack-protector-strong
|
|
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
|
|
STRIP=strip
|
|
|
endif
|
|
endif
|
|
|
|
|
|
|
@@ -91,6 +96,9 @@ one: $(CORE_OBJS) $(ONE_OBJS) one.o mac-agent
|
|
|
|
|
|
|
|
zerotier-one: one
|
|
zerotier-one: one
|
|
|
|
|
|
|
|
|
|
+central-controller:
|
|
|
|
|
+ make ZT_CONTROLLER=1 one
|
|
|
|
|
+
|
|
|
zerotier-idtool: one
|
|
zerotier-idtool: one
|
|
|
|
|
|
|
|
zerotier-cli: one
|
|
zerotier-cli: one
|
Adam Ierymenko