gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

makefile tweak

Browse Source
This commit is contained in:
Joseph Henry
2016-07-07 14:50:47 -05:00
parent 41308ccf06
commit efce6da230
5 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
integrations/apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

BIN
integrations/apple/example_app/Example_OSX_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

16
make-mac.mk
View File

@@ -49,7 +49,18 @@ endif
CXXFLAGS=$(CFLAGS) -fno-rtti CXXFLAGS=$(CFLAGS) -fno-rtti
all: osx_app_framework ios_app_framework osx_unity3d_bundle ios_unity3d_bundle android_jni_lib osx_shared_lib check # Build everything
all: osx ios android check
# Build all iOS targets
ios: ios_app_framework ios_unity3d_bundle
# Build all OSX targets
osx: osx_app_framework osx_unity3d_bundle osx_shared_lib
# Build all Android targets
# Chip architectures can be specified in integrations/android/android_jni_lib/java/jni/Application.mk
android: android_jni_lib
# TODO: CHECK if XCODE TOOLS are installed # TODO: CHECK if XCODE TOOLS are installed
# Build frameworks for application development # Build frameworks for application development
@@ -87,7 +98,8 @@ osx_shared_lib: remove_only_intermediates $(OBJS)
# Build liblwip.so which must be placed in ZT home for zerotier-sdk-service to work # Build liblwip.so which must be placed in ZT home for zerotier-sdk-service to work
make -f make-liblwip.mk 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 # 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 src ; gcc $(DEFS) -O2 -Wall -std=c99 -fPIC -fno-common -dynamiclib -flat_namespace -DVERBOSE -D_GNU_SOURCE -DNETCON_INTERCEPT -I. -I../zerotierone/node -nostdlib -shared -o $(BUILD)/libztintercept.so SDK_Sockets.c SDK_Intercept.c SDK_Debug.c SDK_RPC.c -ldl cd src ; gcc $(DEFS) -O2 -Wall -std=c99 -fPIC -fno-common -dynamiclib -flat_namespace -DVERBOSE -D_GNU_SOURCE -DNETCON_INTERCEPT -I. -I../zerotierone/node -nostdlib -shared -o libztintercept.so SDK_Sockets.c SDK_Intercept.c SDK_Debug.c SDK_RPC.c -ldl
mv src/libztintercept.so $(BUILD)/osx_shared_lib/libztintercept.so
ln -sf zerotier-sdk-service zerotier-cli ln -sf zerotier-sdk-service zerotier-cli
ln -sf zerotier-sdk-service zerotier-idtool ln -sf zerotier-sdk-service zerotier-idtool
cp docs/osx_zt_sdk.md $(BUILD)/osx_shared_lib/README.md cp docs/osx_zt_sdk.md $(BUILD)/osx_shared_lib/README.md

4
src/SDK_ServiceSetup.cpp
View File

@@ -74,7 +74,7 @@ extern "C" {
// Starts a service at the specified path // Starts a service at the specified path
void unity_start_service(char * path, int len) { void unity_start_service(char * path, int len) {
Debug(path); Debug(path);
zt_init_rpc(path); zt_init_rpc(path,"");
init_service(INTERCEPT_DISABLED, path); init_service(INTERCEPT_DISABLED, path);
} }
#endif #endif
@@ -157,7 +157,7 @@ extern "C" {
#if defined(__UNITY_3D__) && !defined(__ANDROID__) && !defined(__IOS__) #if defined(__UNITY_3D__) && !defined(__ANDROID__) && !defined(__IOS__)
// Unity3D on a non-mobile platform // Unity3D on a non-mobile platform
homeDir = "" + current_dir; // homeDir shall be current dir homeDir = current_dir; // homeDir shall be current dir
#endif #endif
#if defined(__ANDROID__) #if defined(__ANDROID__)

1
src/SDK_Sockets.c
View File

@@ -76,6 +76,7 @@
void dwr(int level, const char *fmt, ... ); void dwr(int level, const char *fmt, ... );
char *api_netpath = (char *)0; char *api_netpath = (char *)0;
void load_symbols(); void load_symbols();
void load_symbols_rpc();
int (*realclose)(CLOSE_SIG); int (*realclose)(CLOSE_SIG);
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------