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

Updated Makefile to fix build error on NO_STACK configurations

Browse Source
This commit is contained in:
Joseph Henry
2017-09-19 11:18:01 -07:00
parent 5e320fb950
commit 109162841d
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -268,7 +268,7 @@ endif
ifeq ($(NO_STACK),1)
static_lib: $(ZTO_OBJS)
@mkdir -p $(BUILD) obj
$(CXX) $(CXXFLAGS) $(LIBZT_FILES) -c
$(CXX) $(CXXFLAGS) $(ZT_FLAGS) $(ZT_INCLUDES) $(LIBZT_FLAGS) $(LIBZT_INCLUDES) $(LIBZT_FILES) -c
mv *.o obj
$(ARTOOL) $(ARFLAGS) -o $(STATIC_LIB) obj/*.o
endif
@@ -297,6 +297,14 @@ 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 ##
##############################################################################
python_module:
swig -cpperraswarn -python -c++ -o examples/python/libzt.cc examples/python/swig_libzt.i
python examples/python/setup.py build_ext --inplace --swig-opts="-modern -I../../zto/include"
##############################################################################
## Unit Tests ##
##############################################################################