Browse Source

Merge branch 'master' into dev

pull/1/head
Joseph Henry 8 years ago
parent
commit
43331d3fe8
  1. 18
      make-linux.mk

18
make-linux.mk

@ -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…
Cancel
Save