diff --git a/integrations/Android/java/jni/Application.mk b/integrations/Android/java/jni/Application.mk index 1d7c448..bcbb2a0 100644 --- a/integrations/Android/java/jni/Application.mk +++ b/integrations/Android/java/jni/Application.mk @@ -4,5 +4,5 @@ APP_CPPFLAGS := -O3 -DUSE_SOCKS_PROXY -DZT_SDK -fPIC -fPIE -fvectorize -Wall -fs APP_PLATFORM := android-14 # Architectures -#APP_ABI := all -APP_ABI := armeabi-v7a +APP_ABI := all +#APP_ABI := armeabi-v7a diff --git a/integrations/README.md b/integrations/README.md index 5df9ba5..ab7582a 100644 --- a/integrations/README.md +++ b/integrations/README.md @@ -3,7 +3,7 @@ ZeroTier Integrations If you want everything built at once, type `make all` and go play outside for a little while, we'll copy all of the targets into the `build` directory for you along with specific instructions on how to use each binary. -*NOTE: For iOS/OSX Frameworks and Bundles to build, you will need XCode command line tools `xcode-select --install`, for Android JNI libraries to build you'll need to install [Android Studio](https://developer.android.com/studio/index.html), if you don't have these things installed we will detect that and just skip those builds automatically.* +*NOTE: For iOS/OSX Frameworks and Bundles to build, you will need XCode command line tools `xcode-select --install`, for Android JNI libraries to build you'll need to install [Android Studio](https://developer.android.com/studio/index.html) and the [Android NDK](https://developer.android.com/ndk/index.html), and you'll need to tell our project where you put it by putting the path in [this file](Android/proj/local.properties), if you don't have these things installed and configured we will detect that and just skip those builds automatically.* Below are the specific instructions for each integration requiring little to no modification to your code. Remember, with a full build we'll put a copy of the appropriate integration instructions in the resultant binary's folder for you anyway. diff --git a/make-mac.mk.bak b/make-mac.mk.bak deleted file mode 100644 index f0dee10..0000000 --- a/make-mac.mk.bak +++ /dev/null @@ -1,134 +0,0 @@ -ifeq ($(origin CC),default) - CC=$(shell if [ -e /usr/bin/clang ]; then echo clang; else echo gcc; fi) -endif -ifeq ($(origin CXX),default) - CXX=$(shell if [ -e /usr/bin/clang++ ]; then echo clang++; else echo g++; fi) -endif - -INCLUDES= -DEFS= -LIBS= -ARCH_FLAGS=-arch x86_64 - -include objects.mk -OBJS+=osdep/OSXEthernetTap.o - -# Disable codesign since open source users will not have ZeroTier's certs -CODESIGN=echo -PRODUCTSIGN=echo -CODESIGN_APP_CERT= -CODESIGN_INSTALLER_CERT= - -# Build with libminiupnpc by default for Mac -ZT_USE_MINIUPNPC?=1 - -# For internal use only -- signs everything with ZeroTier's developer cert -ifeq ($(ZT_OFFICIAL_RELEASE),1) - DEFS+=-DZT_OFFICIAL_RELEASE -DZT_AUTO_UPDATE - ZT_USE_MINIUPNPC=1 - CODESIGN=codesign - PRODUCTSIGN=productsign - CODESIGN_APP_CERT="Developer ID Application: ZeroTier Networks LLC (8ZD9JUCZ4V)" - CODESIGN_INSTALLER_CERT="Developer ID Installer: ZeroTier Networks LLC (8ZD9JUCZ4V)" -endif - -# Build with ZT_ENABLE_CLUSTER=1 to build with cluster support -ifeq ($(ZT_ENABLE_CLUSTER),1) - DEFS+=-DZT_ENABLE_CLUSTER -endif - -ifeq ($(ZT_AUTO_UPDATE),1) - DEFS+=-DZT_AUTO_UPDATE -endif - -ifeq ($(ZT_USE_MINIUPNPC),1) - DEFS+=-DMACOSX -DZT_USE_MINIUPNPC -DMINIUPNP_STATICLIB -D_DARWIN_C_SOURCE -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -D_BSD_SOURCE -D_DEFAULT_SOURCE -DOS_STRING=\"Darwin/15.0.0\" -DMINIUPNPC_VERSION_STRING=\"1.9\" -DUPNP_VERSION_STRING=\"UPnP/1.1\" -DENABLE_STRNATPMPERR - OBJS+=ext/libnatpmp/natpmp.o ext/libnatpmp/getgateway.o ext/miniupnpc/connecthostport.o ext/miniupnpc/igd_desc_parse.o ext/miniupnpc/minisoap.o ext/miniupnpc/minissdpc.o ext/miniupnpc/miniupnpc.o ext/miniupnpc/miniwget.o ext/miniupnpc/minixml.o ext/miniupnpc/portlistingparse.o ext/miniupnpc/receivedata.o ext/miniupnpc/upnpcommands.o ext/miniupnpc/upnpdev.o ext/miniupnpc/upnperrors.o ext/miniupnpc/upnpreplyparse.o osdep/PortMapper.o -endif - -# Build with ZT_ENABLE_NETWORK_CONTROLLER=1 to build with the Sqlite network controller -ifeq ($(ZT_ENABLE_NETWORK_CONTROLLER),1) - DEFS+=-DZT_ENABLE_NETWORK_CONTROLLER - LIBS+=-L/usr/local/lib -lsqlite3 - OBJS+=controller/SqliteNetworkController.o -endif - -# Debug mode -- dump trace output, build binary with -g -ifeq ($(ZT_DEBUG),1) - DEFS+=-DZT_TRACE - CFLAGS+=-Wall -g -pthread $(INCLUDES) $(DEFS) - STRIP=echo - # The following line enables optimization for the crypto code, since - # C25519 in particular is almost UNUSABLE in heavy testing without it. -ext/lz4/lz4.o node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CFLAGS = -Wall -O2 -g -pthread $(INCLUDES) $(DEFS) -else - CFLAGS?=-Ofast -fstack-protector - CFLAGS+=$(ARCH_FLAGS) -Wall -flto -fPIE -pthread -mmacosx-version-min=10.7 -DNDEBUG -Wno-unused-private-field $(INCLUDES) $(DEFS) - STRIP=strip -endif - -# Debug output for Network Containers -# Specific levels can be controlled in netcon/common.inc.c -ifeq ($(SDK_DEBUG),1) - DEFS+=-D_SDK_DEBUG -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 - -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_SERVICE_NETCON -DZT_ONE_NO_ROOT_CHECK -Izerotierone -Izerotierone/include -Iext/lwip/src/include -Iext/lwip/src/include/ipv4 -Iext/lwip/src/include/ipv6 -o zerotier-sdk-service $(OBJS) service/OneService.cpp src/SDK_EthernetTap.cpp src/SDK_Proxy.cpp one.cpp -x c src/SDK_RPC.c $(LDLIBS) -ldl - # Build src/liblwip.so which must be placed in ZT home for zerotier-sdk-service to work - make -f make-liblwip.mk - # Use gcc not clang to build standalone intercept library since gcc is typically used for libc and we want to ensure maximal ABI compatibility - #cd netcon ; gcc $(DEFS) -O2 -Wall -std=c99 -fPIC -fno-common -dynamiclib -flat_namespace -DVERBOSE -D_GNU_SOURCE -DNETCON_INTERCEPT -I. -nostdlib -shared -o libztapi.so zt_api.c common.c RPC.c -ldl - cd src ; gcc $(DEFS) -O2 -Wall -std=c99 -fPIC -fno-common -dynamiclib -flat_namespace -DVERBOSE -D_GNU_SOURCE -DNETCON_INTERCEPT -I. -nostdlib -shared -o libztintercept.so SDK_Sockets.c SDK_Intercept.c SDK_Debug.c SDK_RPC.c -ldl - #cd netcon ; gcc $(DEFS) -O2 -Wall -std=c99 -fPIC -fno-common -dynamiclib -flat_namespace -DVERBOSE -D_GNU_SOURCE -DNETCON_INTERCEPT -I. -nostdlib -shared -o libztkq.so zt_api.c kq.c Intercept.c common.c RPC.c -ldl - cp src/libztintercept.so libztintercept.so - #cp src/libztapi.so libztapi.so - #cp src/libztkq.so libztkq.so - ln -sf zerotier-sdk-service zerotier-cli - ln -sf zerotier-sdk-service zerotier-idtool - -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 src/*.o src/*.so *.dSYM build-* *.pkg *.dmg *.o - rm -rf zerotierone/node/*.o zerotierone/controller/*.o zerotierone/service/*.o zerotierone/osdep/*.o - rm -rf zerotierone/ext/http-parser/*.o zerotierone/ext/lz4/*.o ext/json-parser/*.o $(OBJS) - rm -rf src/zerotier-intercept zerotier-sdk-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: