diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-08-17 10:42:32 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-08-17 10:42:32 -0700 |
| commit | a13f4d8353cf6a7f612333f00282b27cfe2ce9b3 (patch) | |
| tree | 524e028827b55e906672e88c074d3f8350409824 /make-linux.mk | |
| parent | cc808cc2dd4bdcbd838857e4eefc2d69886d9982 (diff) | |
| download | infinitytier-a13f4d8353cf6a7f612333f00282b27cfe2ce9b3.tar.gz infinitytier-a13f4d8353cf6a7f612333f00282b27cfe2ce9b3.zip | |
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.)
Diffstat (limited to 'make-linux.mk')
| -rw-r--r-- | make-linux.mk | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/make-linux.mk b/make-linux.mk index acc22a63..d0d206a1 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -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 |