mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-04-17 20:46:54 +02:00
Merge branch 'master' into dev
This commit is contained in:
commit
43331d3fe8
1 changed files with 10 additions and 8 deletions
|
@ -42,14 +42,6 @@ endif
|
|||
# Trying to use dynamically linked libhttp-parser causes tons of compatibility problems.
|
||||
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)
|
||||
override DEFS+=-DZT_TRACE
|
||||
endif
|
||||
|
@ -80,6 +72,16 @@ else
|
|||
STRIP+=--strip-all
|
||||
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)
|
||||
override DEFS+=-DZT_TRACE
|
||||
endif
|
||||
|
|
Loading…
Add table
Reference in a new issue