We now always build the controller in ZeroTier One, at least for desktop and server targets. Also means that ZeroTier One now requires C++11. (Still keeping C++11 out of the core in node/ though.)

This commit is contained in:
Adam Ierymenko 2016-08-17 10:42:32 -07:00
commit a13f4d8353
10 changed files with 24 additions and 86 deletions

View file

@ -82,12 +82,6 @@ ifeq ($(ZT_USE_MINIUPNPC),1)
endif
endif
ifeq ($(ZT_ENABLE_NETWORK_CONTROLLER),1)
DEFS+=-DZT_ENABLE_NETWORK_CONTROLLER
LDLIBS+=-L/usr/local/lib -lsqlite3
OBJS+=controller/SqliteNetworkController.o
endif
ifeq ($(ZT_ENABLE_CLUSTER),1)
DEFS+=-DZT_ENABLE_CLUSTER
endif