void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 12:33:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into dev

Browse source
This commit is contained in:
Joseph Henry 2018-05-09 10:31:19 -07:00
commit 43331d3fe8
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
make-linux.mk
View file

@ -42,14 +42,6 @@ endif
# Trying to use dynamically linked libhttp-parser causes tons of compatibility problems. # Trying to use dynamically linked libhttp-parser causes tons of compatibility problems.
ONE_OBJS+=ext/http-parser/http_parser.o ONE_OBJS+=ext/http-parser/http_parser.o
ifeq ($(ZT_SYNOLOGY), 1)
override DEFS+=-D__SYNOLOGY__
endif
ifeq ($(ZT_QNAP), 1)
override DEFS+=-D__QNAP__
endif
ifeq ($(ZT_TRACE),1) ifeq ($(ZT_TRACE),1)
override DEFS+=-DZT_TRACE override DEFS+=-DZT_TRACE
endif endif
@ -80,6 +72,16 @@ else
STRIP+=--strip-all STRIP+=--strip-all
endif endif
ifeq ($(ZT_QNAP), 1)
override DEFS+=-D__QNAP__
endif
ifeq ($(ZT_SYNOLOGY), 1)
override CFLAGS+=-fPIC
override CXXFLAGS+=-fPIC
override DEFS+=-D__SYNOLOGY__
endif
ifeq ($(ZT_TRACE),1) ifeq ($(ZT_TRACE),1)
override DEFS+=-DZT_TRACE override DEFS+=-DZT_TRACE
endif endif