diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-06-08 12:57:22 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-06-08 12:57:22 -0700 |
| commit | 7e68791bee4e70a82a1814d489428e01913ef811 (patch) | |
| tree | 32b4657f16443d72e0f675bd520a66a36ebc405d /make-linux.mk | |
| parent | 6c6b18d003c865619582b254be1ea7f6e11ef58c (diff) | |
| download | infinitytier-7e68791bee4e70a82a1814d489428e01913ef811.tar.gz infinitytier-7e68791bee4e70a82a1814d489428e01913ef811.zip | |
Fix include for system json-parser.
Diffstat (limited to 'make-linux.mk')
| -rw-r--r-- | make-linux.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/make-linux.mk b/make-linux.mk index bd81f4df..33669210 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -53,6 +53,7 @@ ifeq ($(wildcard /usr/include/json-parser/json.h),) OBJS+=ext/json-parser/json.o else LDLIBS+=-ljsonparser + DEFS+=-DZT_USE_SYSTEM_JSON_PARSER endif ifeq ($(ZT_OFFICIAL_RELEASE),1) @@ -64,6 +65,7 @@ ifeq ($(ZT_USE_MINIUPNPC),1) 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=\"2.0\" -DUPNP_VERSION_STRING=\"UPnP/1.1\" -DENABLE_STRNATPMPERR OBJS+=osdep/PortMapper.o + # We always use ext/miniupnpc because versions that ship with various Linux distributions are too old #ifeq ($(wildcard /usr/include/miniupnpc/miniupnpc.h),) OBJS+=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 #else @@ -74,6 +76,7 @@ ifeq ($(ZT_USE_MINIUPNPC),1) OBJS+=ext/libnatpmp/natpmp.o ext/libnatpmp/getgateway.o else LDLIBS+=-lnatpmp + DEFS+=-DZT_USE_SYSTEM_NATPMP endif endif |