更新makefile

Hu Chunming
1 parent 9737ffcd
Showing 2 changed files with 4 additions and 3 deletions
build/jni/Makefile
build/src/Makefile
@@ -15,7 +15,9 @@ ALGORITHM_PATH = $(PROJECT_ROOT)/algorithm
  
 TARGET = $(PROJECT_ROOT)/bin/libvillage_ascend_arm_jni.so
  
-CFLAGS =-O2 -fPIC $(INCLUDE) -lrt  -std=c++11 -fvisibility=hidden -DENABLE_DVPP_INTERFACE
+DEFS=-DOS_LINUX -DENABLE_DVPP_INTERFACE
+
+CFLAGS =-O2 -fPIC $(INCLUDE) -lrt  -std=c++11 -fvisibility=hidden -DENABLE_DVPP_INTERFACE -D_GLIBCXX_USE_CXX11_ABI=0
  
  
 INCLUDE= -I $(SRC_ROOT)/include \
@@ -23,7 +25,6 @@ INCLUDE= -I $(SRC_ROOT)/include \
    -I $(THIRDPARTY_ROOT)/jdk1.8.0_171/include \
    -I $(THIRDPARTY_ROOT)/jdk1.8.0_171/include/linux \
    -I $(THIRDPARTY_ROOT)/opencv_4_1/include \
-   -I $(THIRDPARTY_ROOT)/curl/include \
    -I$(PROJECT_ROOT)/src/common \
    -I$(PROJECT_ROOT)/src/common/dvpp \
    -I$(ACL_PATH)/include \
@@ -59,7 +59,7 @@ SHARED_LIBRARIES      := $(foreach shared_lib, $(local_shared_libs), -l$(shared_
 #SHARED_LIBRARIES_DIRS := $(foreach shared_lib_dir, $(local_shared_libs_dirs), -L$(shared_lib_dir) -Wl,-z,relro,-z,now,-z,noexecstack,-rpath-link,$(shared_lib_dir))
 SHARED_LIBRARIES_DIRS := $(foreach shared_lib_dir, $(local_shared_libs_dirs), -L$(shared_lib_dir) -Wl,-z,relro,-z,now,-z,noexecstack,-rpath,$(shared_lib_dir))
  
-CXXFLAGS= -g -O0 -fPIC -shared $(INCLUDES) $(DEFS) -lpthread -lrt -lz -fexceptions -std=c++11 -DENABLE_DVPP_INTERFACE -D_GLIBCXX_USE_CXX11_ABI=0 -fvisibility=hidden -Wall -Wno-deprecated -Wdeprecated-declarations -Wl,-Bsymbolic -ldl
+CXXFLAGS= -g -O0 -fPIC -shared $(INCLUDES) $(DEFS) -lpthread -lrt -lz -fexceptions -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=0 -fvisibility=hidden -Wall -Wno-deprecated -Wdeprecated-declarations -Wl,-Bsymbolic -ldl
  
 SRCS := $(wildcard $(CUR_PROJ_PATH)/*.cpp) \
 		$(wildcard $(CUR_PROJ_PATH)/ai_engine_module/*.cpp) \