From 559e384130407db3a507f8edff0a442258529937 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Tue, 28 Jul 2015 15:37:18 -0700
Subject: Linux make support for libminiupnpc.

---
 ext/bin/miniupnpc/linux-arm32/libminiupnpc.a | Bin 0 -> 62698 bytes
 ext/bin/miniupnpc/linux-arm6l/libminiupnpc.a | Bin 62698 -> 0 bytes
 make-linux.mk                                |  26 ++++++++++++++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 ext/bin/miniupnpc/linux-arm32/libminiupnpc.a
 delete mode 100644 ext/bin/miniupnpc/linux-arm6l/libminiupnpc.a

diff --git a/ext/bin/miniupnpc/linux-arm32/libminiupnpc.a b/ext/bin/miniupnpc/linux-arm32/libminiupnpc.a
new file mode 100644
index 00000000..4983f628
Binary files /dev/null and b/ext/bin/miniupnpc/linux-arm32/libminiupnpc.a differ
diff --git a/ext/bin/miniupnpc/linux-arm6l/libminiupnpc.a b/ext/bin/miniupnpc/linux-arm6l/libminiupnpc.a
deleted file mode 100644
index 4983f628..00000000
Binary files a/ext/bin/miniupnpc/linux-arm6l/libminiupnpc.a and /dev/null differ
diff --git a/make-linux.mk b/make-linux.mk
index d1e0c955..7697e3ac 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -26,6 +26,8 @@ ifeq ($(origin CXX),default)
 	CXX=$(shell if [ -e /usr/bin/clang++ ]; then echo clang++; else echo g++; fi)
 endif
 
+UNAME_M=$(shell uname -m)
+
 INCLUDES=
 DEFS=
 LDLIBS?=
@@ -36,6 +38,30 @@ OBJS+=osdep/LinuxEthernetTap.o
 # "make official" is a shortcut for this
 ifeq ($(ZT_OFFICIAL_RELEASE),1)
 	DEFS+=-DZT_OFFICIAL_RELEASE 
+	ZT_USE_MINIUPNPC=1
+endif
+
+ifeq ($(ZT_USE_MINIUPNPC),1)
+	DEFS+=-DZT_USE_MINIUPNPC
+	INCLUDES+=-Iext/bin/miniupnpc/include
+ifeq ($(UNAME_M),armv6l)
+	MINIUPNPC_LIB=ext/bin/miniupnpc/linux-arm32/libminiupnpc.a
+endif
+ifeq ($(UNAME_M),armv7l)
+	MINIUPNPC_LIB=ext/bin/miniupnpc/linux-arm32/libminiupnpc.a
+endif
+ifeq ($(UNAME_M),x86_64)
+	MINIUPNPC_LIB=ext/bin/miniupnpc/linux-x64/libminiupnpc.a
+endif
+ifeq ($(UNAME_M),i386)
+	MINIUPNPC_LIB=ext/bin/miniupnpc/linux-x86/libminiupnpc.a
+endif
+ifeq ($(UNAME_M),i686)
+	MINIUPNPC_LIB=ext/bin/miniupnpc/linux-x86/libminiupnpc.a
+endif
+	MINIUPNPC_LIB?=-lminiupnpc
+	LDLIBS+=$(MINIUPNPC_LIB)
+	OBJS+=osdep/UPNPClient.o
 endif
 
 # Build with ZT_ENABLE_NETWORK_CONTROLLER=1 to build with the Sqlite network controller
-- 
cgit v1.2.3