diff options
| author | Grant Limberg <[email protected]> | 2020-08-05 14:26:11 -0700 |
|---|---|---|
| committer | Grant Limberg <[email protected]> | 2020-08-05 14:26:11 -0700 |
| commit | 302ac8fefe67284bcdcc81c50fe3ed2419e96b78 (patch) | |
| tree | f2f65f97f7c3e14a783239e9acd855a273e732a2 /make-mac.mk | |
| parent | d2708daa8eb3d37cffb553a38d4c616db618a7ee (diff) | |
DNS config support on macOS
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 ada65ff7..acf17dd4 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -25,10 +25,10 @@ TIMESTAMP=$(shell date +"%Y%m%d%H%M") DEFS+=-DZT_BUILD_PLATFORM=$(ZT_BUILD_PLATFORM) -DZT_BUILD_ARCHITECTURE=$(ZT_BUILD_ARCHITECTURE) include objects.mk -ONE_OBJS+=osdep/MacEthernetTap.o osdep/MacKextEthernetTap.o ext/http-parser/http_parser.o +ONE_OBJS+=osdep/MacEthernetTap.o osdep/MacKextEthernetTap.o osdep/MacDNSHelper.o ext/http-parser/http_parser.o ifeq ($(ZT_CONTROLLER),1) - LIBS+=-L/usr/local/opt/libpq/lib -lpq ext/redis-plus-plus-1.1.1/install/macos/lib/libredis++.a ext/hiredis-0.14.1/lib/macos/libhiredis.a + LIBS+=-L/usr/local/opt/libpq/lib -lpq ext/redis-plus-plus-1.1.1/install/macos/lib/libredis++.a ext/hiredis-0.14.1/lib/macos/libhiredis.a -framework SystemConfiguration -framework CoreFoundation DEFS+=-DZT_CONTROLLER_USE_LIBPQ -DZT_CONTROLLER_USE_REDIS -DZT_CONTROLLER INCLUDES+=-I/usr/local/opt/libpq/include -Iext/hiredis-0.14.1/include/ -Iext/redis-plus-plus-1.1.1/install/macos/include/sw/ @@ -97,7 +97,11 @@ mac-agent: FORCE $(CC) -Ofast -o MacEthernetTapAgent osdep/MacEthernetTapAgent.c $(CODESIGN) -f -s $(CODESIGN_APP_CERT) MacEthernetTapAgent +osdep/MacDNSHelper.o: osdep/MacDNSHelper.mm + $(CXX) $(CXXFLAGS) -c osdep/MacDNSHelper.mm -o osdep/MacDNSHelper.o + one: $(CORE_OBJS) $(ONE_OBJS) one.o mac-agent + $(CXX) $(CXXFLAGS) -o zerotier-one $(CORE_OBJS) $(ONE_OBJS) one.o $(LIBS) # $(STRIP) zerotier-one ln -sf zerotier-one zerotier-idtool |