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

Moved JNI wrapper into separate file. Updated shared_jni_lib build target

Browse Source
This commit is contained in:
Joseph Henry
2017-10-13 13:14:04 -07:00
parent f06bbf74c5
commit 83419fb89e
4 changed files with 340 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile
View File

@@ -295,13 +295,16 @@ libzt_socket_layer:
$(CXX) $(CXXFLAGS) -c src/libzt.cpp \
$(ZT_DEFS) $(ZT_INCLUDES) $(STACK_INCLUDES) $(LIBZT_DEFS) $(LIBZT_INCLUDES) $(STACK_DRIVER_DEFS)
jni_socket_wrapper:
$(CXX) $(CXXFLAGS) -DSDK_JNI -c src/libztJNI.cpp \
$(ZT_DEFS) $(ZT_INCLUDES) $(STACK_INCLUDES) $(LIBZT_DEFS) $(LIBZT_INCLUDES) $(STACK_DRIVER_DEFS)
utilities:
$(CXX) $(CXXFLAGS) -c src/Platform.cpp \
$(LIBZT_INCLUDES)
$(CXX) $(CXXFLAGS) -c src/Utilities.cpp \
$(ZT_DEFS) $(ZT_INCLUDES) $(LIBZT_INCLUDES) $(STACK_DRIVER_DEFS)
win_dll: lwip lwip_driver libzt_socket_layer utilities $(ZTO_OBJS)
# First we use mingw to build our DLL
@mkdir -p $(BUILD) obj
@@ -313,6 +316,16 @@ win_dll: lwip lwip_driver libzt_socket_layer utilities $(ZTO_OBJS)
# lib /machine:x64 /def:libzt.def
# or just execute: makelib
shared_lib: lwip lwip_driver libzt_socket_layer utilities $(ZTO_OBJS)
@mkdir -p $(BUILD) obj
mv *.o obj
$(CXX) $(CXXFLAGS) -shared -o $(BUILD)/libzt.so obj/*.o
shared_jni_lib: lwip lwip_driver libzt_socket_layer jni_socket_wrapper utilities $(ZTO_OBJS)
@mkdir -p $(BUILD) obj
mv *.o obj
$(CXX) $(CXXFLAGS) -shared -o $(BUILD)/libzt.so obj/*.o
ifeq ($(STACK_PICO),1)
static_lib: picotcp picotcp_driver libzt_socket_layer utilities $(ZTO_OBJS)
@mkdir -p $(BUILD) obj
@@ -354,14 +367,6 @@ macos_app_framework:
cd examples/apple/ZeroTierSDK_Apple; xcodebuild -configuration Debug \
-scheme ZeroTierSDK_OSX build SYMROOT="../../../$(BUILD)/macos_app_framework"
##############################################################################
## Java JNI ##
##############################################################################
shared_jni_lib: picotcp $(ZTO_OBJS)
$(CXX) $(CXXFLAGS) $(TAP_FILES) $(STACK_DRIVER_FILES) $(ZTO_OBJS) $(INCLUDES) \
$(PICO_LIB) -dynamiclib -o $(SHARED_JNI_LIB)
##############################################################################
## Python module ##
##############################################################################