diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-07-28 16:51:46 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-07-28 16:51:46 -0700 |
| commit | e3983f8a574f4bb4b54bba5995c5f8be0ac78957 (patch) | |
| tree | 8421438ed089b3320697a7fb96ed587315c5ac47 | |
| parent | 14264c2d6f7d20b15081a1db5e8ca4b978d935a0 (diff) | |
| download | infinitytier-e3983f8a574f4bb4b54bba5995c5f8be0ac78957.tar.gz infinitytier-e3983f8a574f4bb4b54bba5995c5f8be0ac78957.zip | |
Get rid of -I on Mac and Linux since we include miniupnpc headers by direct path reference.
| -rw-r--r-- | make-linux.mk | 1 | ||||
| -rw-r--r-- | make-mac.mk | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/make-linux.mk b/make-linux.mk index 7697e3ac..2ef9b985 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -43,7 +43,6 @@ 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 diff --git a/make-mac.mk b/make-mac.mk index 707d517c..c0b3f89d 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -14,7 +14,7 @@ include objects.mk OBJS+=osdep/OSXEthernetTap.o # 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 CODESIGN=echo @@ -38,7 +38,6 @@ endif ifeq ($(ZT_USE_MINIUPNPC),1) DEFS+=-DZT_USE_MINIUPNPC - INCLUDES+=-Iext/bin/miniupnpc/include LIBS+=ext/bin/miniupnpc/mac-x64/libminiupnpc.a OBJS+=osdep/UPNPClient.o endif |