Added Xcode build instructions to make-mac.mk

docs/todo.md

@@ -11,3 +11,7 @@ Unity
  * check that .IsRunning() doesn't bork the entire system anymore
  * Allow max packet size configuration
  * Handle exceptions from unmanaged code
+
+Documentation
+ * Refactor
+  * Fix broken references

integrations/README.md

@@ -3,7 +3,7 @@ ZeroTier Integrations
 
 This is a collection of example projects demonstrating how you can embed or integrate ZeroTier functionality directly into your applications and games with *little to no change to your code*. 
 
-For more support on these integrations take a look at the [docs/](../docs) folder. Specifically the [Shims](../docs/shims_zt_sdk.md) and [SDK API](../docs/zt_sdk.md) overviews. 
+For more support on these integrations take a look at the [docs](../docs) folder. Specifically the [Shims](../docs/shims_zt_sdk.md) and [SDK API](../docs/zt_sdk.md) overviews. 
 Also stop by our [community section](https://www.zerotier.com/community/) for more in-depth discussion!
 
 ***

make-mac.mk

@@ -75,17 +75,15 @@ endif
 
 CXXFLAGS=$(CFLAGS) -fno-rtti
 
-all: one
-
-one:	$(OBJS) service/OneService.o one.o
-	$(CXX) $(CXXFLAGS) -o zerotier-one $(OBJS) service/OneService.o one.o $(LIBS)
-	$(STRIP) zerotier-one
-	ln -sf zerotier-one zerotier-idtool
-	ln -sf zerotier-one zerotier-cli
-	$(CODESIGN) -f -s $(CODESIGN_APP_CERT) zerotier-one
-	$(CODESIGN) -vvv zerotier-one
-
-netcon: $(OBJS)
+# Build frameworks for application development
+# Build bundles for Unity integrations
+all: 
+	cd integrations/Apple/ZeroTierSDK_Apple; xcodebuild -scheme ZeroTierSDK_OSX build SYMROOT="../../../build/OSX_Framework"
+	cd integrations/Apple/ZeroTierSDK_Apple; xcodebuild -scheme ZeroTierSDK_iOS build SYMROOT="../../../build/iOS_Framework"
+	cd integrations/Apple/ZeroTierSDK_Apple; xcodebuild -scheme ZeroTierSDK_Unity3D_OSX build SYMROOT="../../../build/OSX_Unity_Bundle"
+	cd integrations/Apple/ZeroTierSDK_Apple; xcodebuild -scheme ZeroTierSDK_Unity3D_iOS build SYMROOT="../../../build/iOS_Unity_Bundle"
+
+sdk: $(OBJS)
 	rm -f *.o
 	# Need to selectively rebuild one.cpp and OneService.cpp with ZT_SERVICE_NETCON and ZT_ONE_NO_ROOT_CHECK defined, and also NetconEthernetTap
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -DZT_SDK -DZT_ONE_NO_ROOT_CHECK -Iext/lwip/src/include -Iext/lwip/src/include/ipv4 -Iext/lwip/src/include/ipv6 -o zerotier-netcon-service $(OBJS) service/OneService.cpp netcon/NetconEthernetTap.cpp netcon/NetconProxy.cpp one.cpp -x c netcon/NetconRPC.c $(LDLIBS) -ldl
@@ -105,30 +103,11 @@ selftest: $(OBJS) selftest.o
 	$(CXX) $(CXXFLAGS) -o zerotier-selftest selftest.o $(OBJS) $(LIBS)
 	$(STRIP) zerotier-selftest
 
-# Requires Packages: http://s.sudre.free.fr/Software/Packages/about.html
-mac-dist-pkg: FORCE
-	packagesbuild "ext/installfiles/mac/ZeroTier One.pkgproj"
-	rm -f "ZeroTier One Signed.pkg"
-	$(PRODUCTSIGN) --sign $(CODESIGN_INSTALLER_CERT) "ZeroTier One.pkg" "ZeroTier One Signed.pkg"
-	if [ -f "ZeroTier One Signed.pkg" ]; then mv -f "ZeroTier One Signed.pkg" "ZeroTier One.pkg"; fi
-
-# For internal use only
-official: FORCE
-	make ZT_OFFICIAL_RELEASE=1 clean
-	make -j 4 ZT_OFFICIAL_RELEASE=1
-	make ZT_OFFICIAL_RELEASE=1 mac-dist-pkg
-
 clean:
+	rm -rf build
 	# Remove junk generated by Android builds
 	rm -rf netcon/Android/*.o.d
 	rm -rf netcon/Netcon-Android/proj/app/build/intermediates
 	rm -rf netcon/*.o netcon/*.so *.dSYM build-* *.pkg *.dmg *.o node/*.o controller/*.o service/*.o osdep/*.o ext/http-parser/*.o ext/lz4/*.o ext/json-parser/*.o $(OBJS) netcon/zerotier-intercept zerotier-netcon-service ztproxy libztapi.so libztkq.so libztintercept.so zerotier-one zerotier-idtool zerotier-selftest zerotier-cli ZeroTierOneInstaller-* mkworld
 
-# For those building from source -- installs signed binary tap driver in system ZT home
-install-mac-tap: FORCE
-	mkdir -p /Library/Application\ Support/ZeroTier/One
-	rm -rf /Library/Application\ Support/ZeroTier/One/tap.kext
-	cp -R ext/bin/tap-mac/tap.kext /Library/Application\ Support/ZeroTier/One
-	chown -R root:wheel /Library/Application\ Support/ZeroTier/One/tap.kext
-
 FORCE: