diff options
| author | Joseph Henry <josephjah@gmail.com> | 2018-05-09 10:31:19 -0700 |
|---|---|---|
| committer | Joseph Henry <josephjah@gmail.com> | 2018-05-09 10:31:19 -0700 |
| commit | 43331d3fe849bd2d17c8e3e774ef7e47c84d7ce7 (patch) | |
| tree | 4a2c015fdb999003a5a3d2982a3454ce98bd3e1b | |
| parent | 9765ba334abae268aea7644ba1a172a9e704143d (diff) | |
| parent | 22301a459970dc557c4959104afe418d4b2d6bb1 (diff) | |
| download | infinitytier-43331d3fe849bd2d17c8e3e774ef7e47c84d7ce7.tar.gz infinitytier-43331d3fe849bd2d17c8e3e774ef7e47c84d7ce7.zip | |
Merge branch 'master' into dev
| -rw-r--r-- | make-linux.mk | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/make-linux.mk b/make-linux.mk index de209d9f..62f319bf 100644 --- a/make-linux.mk +++ b/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 |