diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-11-30 15:17:31 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-11-30 15:17:31 -0800 |
| commit | 7e28161638a3c64754f55fe84d88917741b49019 (patch) | |
| tree | d6debc90b571e0d32e4d8f30a0803a47b0762eaa /make-linux.mk | |
| parent | ef4472e1857b86b5a45493a3c3566c7761260dad (diff) | |
| parent | 40a4ba6e39bbc59b320eef2f6839cf30c3f7c8b1 (diff) | |
| download | infinitytier-7e28161638a3c64754f55fe84d88917741b49019.tar.gz infinitytier-7e28161638a3c64754f55fe84d88917741b49019.zip | |
Merge dev
Diffstat (limited to 'make-linux.mk')
| -rw-r--r-- | make-linux.mk | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/make-linux.mk b/make-linux.mk index c5efda93..2614fdfe 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -43,9 +43,8 @@ ifeq ($(ZT_OFFICIAL_RELEASE),1) endif ifeq ($(ZT_USE_MINIUPNPC),1) - DEFS+=-DZT_USE_MINIUPNPC - LDLIBS+=ext/miniupnpc/libminiupnpc.a - OBJS+=osdep/UPNPClient.o + DEFS+=-DZT_USE_MINIUPNPC -DMINIUPNP_STATICLIB -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -DOS_STRING=\"Linux\" -DMINIUPNPC_VERSION_STRING=\"1.9\" -DUPNP_VERSION_STRING=\"UPnP/1.1\" -DENABLE_STRNATPMPERR + OBJS+=ext/libnatpmp/natpmp.o ext/libnatpmp/getgateway.o ext/miniupnpc/connecthostport.o ext/miniupnpc/igd_desc_parse.o ext/miniupnpc/minisoap.o ext/miniupnpc/minissdpc.o ext/miniupnpc/miniupnpc.o ext/miniupnpc/miniwget.o ext/miniupnpc/minixml.o ext/miniupnpc/portlistingparse.o ext/miniupnpc/receivedata.o ext/miniupnpc/upnpcommands.o ext/miniupnpc/upnpdev.o ext/miniupnpc/upnperrors.o ext/miniupnpc/upnpreplyparse.o osdep/PortMapper.o endif # Build with ZT_ENABLE_NETWORK_CONTROLLER=1 to build with the Sqlite network controller @@ -65,8 +64,13 @@ ifeq ($(ZT_DEBUG),1) DEFS+=-DZT_TRACE CFLAGS+=-Wall -g -pthread $(INCLUDES) $(DEFS) CXXFLAGS+=-Wall -g -pthread $(INCLUDES) $(DEFS) +<<<<<<< HEAD LDFLAGS=-ldl STRIP=echo +======= + LDFLAGS= + STRIP?=echo +>>>>>>> origin/dev # The following line enables optimization for the crypto code, since # C25519 in particular is almost UNUSABLE in -O0 even on a 3ghz box! ext/lz4/lz4.o node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CFLAGS = -Wall -O2 -g -pthread $(INCLUDES) $(DEFS) @@ -74,9 +78,16 @@ else CFLAGS?=-O3 -fstack-protector CFLAGS+=-Wall -fPIE -fvisibility=hidden -pthread $(INCLUDES) -DNDEBUG $(DEFS) CXXFLAGS?=-O3 -fstack-protector +<<<<<<< HEAD CXXFLAGS+=-Wall -Wreorder -fPIE -fvisibility=hidden -fno-rtti -pthread $(INCLUDES) -DNDEBUG $(DEFS) LDFLAGS=-ldl -pie -Wl,-z,relro,-z,now STRIP=strip --strip-all +======= + CXXFLAGS+=-Wall -fPIE -fvisibility=hidden -fno-rtti -pthread $(INCLUDES) -DNDEBUG $(DEFS) + LDFLAGS=-pie -Wl,-z,relro,-z,now + STRIP?=strip + STRIP+=--strip-all +>>>>>>> origin/dev endif ifeq ($(ZT_TRACE),1) @@ -92,9 +103,6 @@ endif all: one one: $(OBJS) one.o -ifeq ($(ZT_USE_MINIUPNPC),1) - cd ext/miniupnpc ; make clean ; make 'CFLAGS=-O2 -fstack-protector -fPIE -fno-common -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600' -j 2 libminiupnpc.a -endif $(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-one $(OBJS) one.o $(LDLIBS) $(STRIP) zerotier-one ln -sf zerotier-one zerotier-idtool @@ -108,6 +116,7 @@ installer: one FORCE ./ext/installfiles/linux/buildinstaller.sh clean: +<<<<<<< HEAD find ./ -type f -name '*.o' -delete find netcon/ -type f -name '*.so' -delete find netcon/ -type f -name '*.1.0' -delete @@ -116,6 +125,9 @@ clean: find netcon/docker-test -name "zerotier-intercept" -type f -delete rm -rf zerotier-one zerotier-idtool zerotier-cli zerotier-selftest zerotier-netcon build-* ZeroTierOneInstaller-* *.deb *.rpm *.pkg *.tgz cd ext/miniupnpc ; make clean +======= + rm -rf *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/lz4/*.o ext/json-parser/*.o $(OBJS) zerotier-one zerotier-idtool zerotier-cli zerotier-selftest build-* ZeroTierOneInstaller-* *.deb *.rpm +>>>>>>> origin/dev debug: FORCE make ZT_DEBUG=1 one |