diff options
| author | Travis LaDuke <travisladuke@gmail.com> | 2019-03-18 17:01:05 -0700 |
|---|---|---|
| committer | Travis LaDuke <travisladuke@gmail.com> | 2019-03-18 17:01:05 -0700 |
| commit | af60e769b0c3ec837170e7284c13a75a735495c8 (patch) | |
| tree | 881a4dd4955e8f0a88d985669dda20b8b2987483 | |
| parent | 95bfc29c92f1c689f181142d226ad642f86cee10 (diff) | |
| download | infinitytier-af60e769b0c3ec837170e7284c13a75a735495c8.tar.gz infinitytier-af60e769b0c3ec837170e7284c13a75a735495c8.zip | |
Allow mac users to `make central-controller`
Made the smallest change I could figure out.
Had to remove -Werror because something in the postgres adapter woudn't
compile.
brew install postgresql rabbitmq-c
and seems to put the libs in the right place
| -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 4363d38f..87f15a59 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 |