You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
47 lines
2.5 KiB
47 lines
2.5 KiB
From 61b69f74fecf3c34c0fd2003897c92790ca5a9f5 Mon Sep 17 00:00:00 2001
|
|
From: Moritz Warning <moritzwarning@web.de>
|
|
Date: Thu, 4 May 2017 22:13:55 +0200
|
|
Subject: [PATCH 1/2] use external libminiupnpc and libnatpmp
|
|
|
|
---
|
|
make-linux.mk | 20 ++++++++++----------
|
|
1 file changed, 10 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/make-linux.mk b/make-linux.mk
|
|
index 87d29af..f5b3d8d 100644
|
|
--- a/make-linux.mk
|
|
+++ b/make-linux.mk
|
|
@@ -22,20 +22,20 @@ OBJS+=ext/http-parser/http_parser.o
|
|
# otherwise build into binary as done on Mac and Windows.
|
|
OBJS+=osdep/PortMapper.o
|
|
DEFS+=-DZT_USE_MINIUPNPC
|
|
-MINIUPNPC_IS_NEW_ENOUGH=$(shell grep -sqr '.*define.*MINIUPNPC_VERSION.*"2.."' /usr/include/miniupnpc/miniupnpc.h && echo 1)
|
|
-ifeq ($(MINIUPNPC_IS_NEW_ENOUGH),1)
|
|
+#MINIUPNPC_IS_NEW_ENOUGH=$(shell grep -sqr '.*define.*MINIUPNPC_VERSION.*"2.."' /usr/include/miniupnpc/miniupnpc.h && echo 1)
|
|
+#ifeq ($(MINIUPNPC_IS_NEW_ENOUGH),1)
|
|
DEFS+=-DZT_USE_SYSTEM_MINIUPNPC
|
|
LDLIBS+=-lminiupnpc
|
|
-else
|
|
- DEFS+=-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+=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
|
|
-endif
|
|
-ifeq ($(wildcard /usr/include/natpmp.h),)
|
|
- OBJS+=ext/libnatpmp/natpmp.o ext/libnatpmp/getgateway.o
|
|
-else
|
|
+#else
|
|
+# DEFS+=-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+=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
|
|
+#endif
|
|
+#ifeq ($(wildcard /usr/include/natpmp.h),)
|
|
+# OBJS+=ext/libnatpmp/natpmp.o ext/libnatpmp/getgateway.o
|
|
+#else
|
|
LDLIBS+=-lnatpmp
|
|
DEFS+=-DZT_USE_SYSTEM_NATPMP
|
|
-endif
|
|
+#endif
|
|
|
|
ifeq ($(ZT_ENABLE_CLUSTER),1)
|
|
DEFS+=-DZT_ENABLE_CLUSTER
|
|
--
|
|
2.1.4
|
|
|