diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-07-28 14:48:26 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-07-28 14:48:26 -0700 |
| commit | 569c5e77fdd247f59d48d1732dbea6a69bc7d6b3 (patch) | |
| tree | 67c2177b4b959e91c5b63c8ce87ff8f8e71438dc /make-mac.mk | |
| parent | 9c87decba68189fec02c50439fc4fed89f7328f3 (diff) | |
| download | infinitytier-569c5e77fdd247f59d48d1732dbea6a69bc7d6b3.tar.gz infinitytier-569c5e77fdd247f59d48d1732dbea6a69bc7d6b3.zip | |
Add binary build of libminiupnpc for Mac x64.
Diffstat (limited to 'make-mac.mk')
| -rw-r--r-- | make-mac.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/make-mac.mk b/make-mac.mk index 55b117e6..707d517c 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -5,7 +5,7 @@ ifeq ($(origin CXX),default) CXX=$(shell if [ -e /usr/bin/clang++ ]; then echo clang++; else echo g++; fi) endif -INCLUDES=-I/usr/local/include +INCLUDES= DEFS= LIBS= ARCH_FLAGS=-arch x86_64 @@ -13,6 +13,9 @@ ARCH_FLAGS=-arch x86_64 include objects.mk OBJS+=osdep/OSXEthernetTap.o +# Comment out to disable building against shipped libminiupnpc binary for Mac +ZT_USE_MINIUPNPC=1 + # Disable codesign since open source users will not have ZeroTier's certs CODESIGN=echo PRODUCTSIGN=echo @@ -35,7 +38,8 @@ endif ifeq ($(ZT_USE_MINIUPNPC),1) DEFS+=-DZT_USE_MINIUPNPC - LIBS+=/usr/local/lib/libminiupnpc.a + INCLUDES+=-Iext/bin/miniupnpc/include + LIBS+=ext/bin/miniupnpc/mac-x64/libminiupnpc.a OBJS+=osdep/UPNPClient.o endif |