void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 20:43:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Linux make support for libminiupnpc.

Browse source
This commit is contained in:
Adam Ierymenko 2015-07-28 15:37:18 -07:00
parent ebe5c526bb
commit 559e384130
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
ext/bin/miniupnpc/linux-arm6l/libminiupnpc.a → ext/bin/miniupnpc/linux-arm32/libminiupnpc.a
View file

26
make-linux.mk
View file

@ -26,6 +26,8 @@ ifeq ($(origin CXX),default)
CXX=$(shell if [ -e /usr/bin/clang++ ]; then echo clang++; else echo g++; fi) CXX=$(shell if [ -e /usr/bin/clang++ ]; then echo clang++; else echo g++; fi)
endif endif
UNAME_M=$(shell uname -m)
INCLUDES= INCLUDES=
DEFS= DEFS=
LDLIBS?= LDLIBS?=
@ -36,6 +38,30 @@ OBJS+=osdep/LinuxEthernetTap.o
# "make official" is a shortcut for this # "make official" is a shortcut for this
ifeq ($(ZT_OFFICIAL_RELEASE),1) ifeq ($(ZT_OFFICIAL_RELEASE),1)
DEFS+=-DZT_OFFICIAL_RELEASE 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 endif
# Build with ZT_ENABLE_NETWORK_CONTROLLER=1 to build with the Sqlite network controller # Build with ZT_ENABLE_NETWORK_CONTROLLER=1 to build with the Sqlite network controller