zerotier/libzt
0
0
Fork 0
mirror of https://github.com/zerotier/libzt.git synced 2026-09-22 15:29:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebuilt ZeroTierUnity-OSX bundle project

Browse Source
This commit is contained in:
Joseph Henry
2016-06-15 10:16:26 -07:00
parent a841ab467d
commit 1f74ceaea6
11 changed files with 1782 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files
make-mac.mk
+15 -15
View File
@@ -69,8 +69,8 @@ endif
# Debug output for Network Containers
# Specific levels can be controlled in netcon/common.inc.c
ifeq ($(SDK_DEBUG),1)
DEFS+=-D_SDK_DEBUG
ifeq ($(NETCON_DEBUG),1)
DEFS+=-DNETCON_DEBUG
endif
CXXFLAGS=$(CFLAGS) -fno-rtti
@@ -88,18 +88,18 @@ one: $(OBJS) service/OneService.o one.o
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
$(CXX) $(CXXFLAGS) $(LDFLAGS) -DZT_SERVICE_NETCON -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
# Build netcon/liblwip.so which must be placed in ZT home for zerotier-netcon-service to work
cd netcon ; 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 libztintercept.so NetconSockets.c Intercept.c NetconDebug.c NetconRPC.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
cp netcon/libztintercept.so libztintercept.so
#cp netcon/libztapi.so libztapi.so
#cp netcon/libztkq.so libztkq.so
ln -sf zerotier-netcon-service zerotier-cli
ln -sf zerotier-netcon-service zerotier-idtool
selftest: $(OBJS) selftest.o
$(CXX) $(CXXFLAGS) -o zerotier-selftest selftest.o $(OBJS) $(LIBS)
@@ -119,10 +119,10 @@ official: FORCE
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
# 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