ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-11 13:35:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of -I on Mac and Linux since we include miniupnpc headers by direct path reference.

Browse Source
This commit is contained in:
Adam Ierymenko 2015-07-28 16:51:46 -07:00
parent 14264c2d6f
commit e3983f8a57
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
make-linux.mk
View File

@ -43,7 +43,6 @@ endif
ifeq ($(ZT_USE_MINIUPNPC),1) ifeq ($(ZT_USE_MINIUPNPC),1)
DEFS+=-DZT_USE_MINIUPNPC DEFS+=-DZT_USE_MINIUPNPC
INCLUDES+=-Iext/bin/miniupnpc/include
ifeq ($(UNAME_M),armv6l) ifeq ($(UNAME_M),armv6l)
MINIUPNPC_LIB=ext/bin/miniupnpc/linux-arm32/libminiupnpc.a MINIUPNPC_LIB=ext/bin/miniupnpc/linux-arm32/libminiupnpc.a
endif endif

3
make-mac.mk
View File

@ -14,7 +14,7 @@ include objects.mk
OBJS+=osdep/OSXEthernetTap.o OBJS+=osdep/OSXEthernetTap.o
# Comment out to disable building against shipped libminiupnpc binary for Mac # Comment out to disable building against shipped libminiupnpc binary for Mac
ZT_USE_MINIUPNPC=1 ZT_USE_MINIUPNPC?=1
# Disable codesign since open source users will not have ZeroTier's certs # Disable codesign since open source users will not have ZeroTier's certs
CODESIGN=echo CODESIGN=echo
@ -38,7 +38,6 @@ endif
ifeq ($(ZT_USE_MINIUPNPC),1) ifeq ($(ZT_USE_MINIUPNPC),1)
DEFS+=-DZT_USE_MINIUPNPC DEFS+=-DZT_USE_MINIUPNPC
INCLUDES+=-Iext/bin/miniupnpc/include
LIBS+=ext/bin/miniupnpc/mac-x64/libminiupnpc.a LIBS+=ext/bin/miniupnpc/mac-x64/libminiupnpc.a
OBJS+=osdep/UPNPClient.o OBJS+=osdep/UPNPClient.o
endif endif