diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-07-28 15:37:18 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-07-28 15:37:18 -0700 |
| commit | 559e384130407db3a507f8edff0a442258529937 (patch) | |
| tree | c29c6f979a9a7aa27c622d7ed422cffc278127fe | |
| parent | ebe5c526bb6ca2b28f8175d2d00e30e0715379a6 (diff) | |
| download | infinitytier-559e384130407db3a507f8edff0a442258529937.tar.gz infinitytier-559e384130407db3a507f8edff0a442258529937.zip | |
Linux make support for libminiupnpc.
| -rw-r--r-- | ext/bin/miniupnpc/linux-arm32/libminiupnpc.a (renamed from ext/bin/miniupnpc/linux-arm6l/libminiupnpc.a) | bin | 62698 -> 62698 bytes | |||
| -rw-r--r-- | make-linux.mk | 26 |
2 files changed, 26 insertions, 0 deletions
diff --git a/ext/bin/miniupnpc/linux-arm6l/libminiupnpc.a b/ext/bin/miniupnpc/linux-arm32/libminiupnpc.a Binary files differindex 4983f628..4983f628 100644 --- a/ext/bin/miniupnpc/linux-arm6l/libminiupnpc.a +++ b/ext/bin/miniupnpc/linux-arm32/libminiupnpc.a 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 |