From 906e49ff7200f15d99d0bd2f9d87f484738929b0 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Mon, 16 Nov 2015 16:22:41 -0800 Subject: [PATCH] Add make option ZT_ENABLE_CLUSTER and disable it in default Linux build. --- make-freebsd.mk | 5 +++++ make-linux.mk | 7 ++++++- make-mac.mk | 5 +++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/make-freebsd.mk b/make-freebsd.mk index 1322dd53b..022540d28 100644 --- a/make-freebsd.mk +++ b/make-freebsd.mk @@ -13,6 +13,11 @@ ifeq ($(ZT_OFFICIAL_RELEASE),1) DEFS+=-DZT_OFFICIAL_RELEASE endif +# Build with ZT_ENABLE_CLUSTER=1 to build with cluster support +ifeq ($(ZT_ENABLE_CLUSTER),1) + DEFS+=-DZT_ENABLE_CLUSTER +endif + # "make debug" is a shortcut for this ifeq ($(ZT_DEBUG),1) DEFS+=-DZT_TRACE diff --git a/make-linux.mk b/make-linux.mk index 37e7b7ef6..339b548d1 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -29,7 +29,7 @@ endif UNAME_M=$(shell $(CC) -dumpmachine | cut -d '-' -f 1) INCLUDES= -DEFS=-DZT_ENABLE_CLUSTER +DEFS= LDLIBS?= include objects.mk @@ -70,6 +70,11 @@ ifeq ($(ZT_ENABLE_NETWORK_CONTROLLER),1) OBJS+=controller/SqliteNetworkController.o endif +# Build with ZT_ENABLE_CLUSTER=1 to build with cluster support +ifeq ($(ZT_ENABLE_CLUSTER),1) + DEFS+=-DZT_ENABLE_CLUSTER +endif + # "make debug" is a shortcut for this ifeq ($(ZT_DEBUG),1) DEFS+=-DZT_TRACE diff --git a/make-mac.mk b/make-mac.mk index 174216fb1..6ea238597 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -32,6 +32,11 @@ ifeq ($(ZT_OFFICIAL_RELEASE),1) CODESIGN_INSTALLER_CERT="Developer ID Installer: ZeroTier Networks LLC (8ZD9JUCZ4V)" endif +# Build with ZT_ENABLE_CLUSTER=1 to build with cluster support +ifeq ($(ZT_ENABLE_CLUSTER),1) + DEFS+=-DZT_ENABLE_CLUSTER +endif + ifeq ($(ZT_AUTO_UPDATE),1) DEFS+=-DZT_AUTO_UPDATE endif