Commit a6115242da31e98978971bb3f74ec35827393afb
1 parent
9737ffcd
更新makefile
Showing
2 changed files
with
4 additions
and
3 deletions
build/jni/Makefile
| @@ -15,7 +15,9 @@ ALGORITHM_PATH = $(PROJECT_ROOT)/algorithm | @@ -15,7 +15,9 @@ ALGORITHM_PATH = $(PROJECT_ROOT)/algorithm | ||
| 15 | 15 | ||
| 16 | TARGET = $(PROJECT_ROOT)/bin/libvillage_ascend_arm_jni.so | 16 | TARGET = $(PROJECT_ROOT)/bin/libvillage_ascend_arm_jni.so |
| 17 | 17 | ||
| 18 | -CFLAGS =-O2 -fPIC $(INCLUDE) -lrt -std=c++11 -fvisibility=hidden -DENABLE_DVPP_INTERFACE | 18 | +DEFS=-DOS_LINUX -DENABLE_DVPP_INTERFACE |
| 19 | + | ||
| 20 | +CFLAGS =-O2 -fPIC $(INCLUDE) -lrt -std=c++11 -fvisibility=hidden -DENABLE_DVPP_INTERFACE -D_GLIBCXX_USE_CXX11_ABI=0 | ||
| 19 | 21 | ||
| 20 | 22 | ||
| 21 | INCLUDE= -I $(SRC_ROOT)/include \ | 23 | INCLUDE= -I $(SRC_ROOT)/include \ |
| @@ -23,7 +25,6 @@ INCLUDE= -I $(SRC_ROOT)/include \ | @@ -23,7 +25,6 @@ INCLUDE= -I $(SRC_ROOT)/include \ | ||
| 23 | -I $(THIRDPARTY_ROOT)/jdk1.8.0_171/include \ | 25 | -I $(THIRDPARTY_ROOT)/jdk1.8.0_171/include \ |
| 24 | -I $(THIRDPARTY_ROOT)/jdk1.8.0_171/include/linux \ | 26 | -I $(THIRDPARTY_ROOT)/jdk1.8.0_171/include/linux \ |
| 25 | -I $(THIRDPARTY_ROOT)/opencv_4_1/include \ | 27 | -I $(THIRDPARTY_ROOT)/opencv_4_1/include \ |
| 26 | - -I $(THIRDPARTY_ROOT)/curl/include \ | ||
| 27 | -I$(PROJECT_ROOT)/src/common \ | 28 | -I$(PROJECT_ROOT)/src/common \ |
| 28 | -I$(PROJECT_ROOT)/src/common/dvpp \ | 29 | -I$(PROJECT_ROOT)/src/common/dvpp \ |
| 29 | -I$(ACL_PATH)/include \ | 30 | -I$(ACL_PATH)/include \ |
build/src/Makefile
| @@ -59,7 +59,7 @@ SHARED_LIBRARIES := $(foreach shared_lib, $(local_shared_libs), -l$(shared_ | @@ -59,7 +59,7 @@ SHARED_LIBRARIES := $(foreach shared_lib, $(local_shared_libs), -l$(shared_ | ||
| 59 | #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)) | 59 | #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)) |
| 60 | 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)) | 60 | 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)) |
| 61 | 61 | ||
| 62 | -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 | 62 | +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 |
| 63 | 63 | ||
| 64 | SRCS := $(wildcard $(CUR_PROJ_PATH)/*.cpp) \ | 64 | SRCS := $(wildcard $(CUR_PROJ_PATH)/*.cpp) \ |
| 65 | $(wildcard $(CUR_PROJ_PATH)/ai_engine_module/*.cpp) \ | 65 | $(wildcard $(CUR_PROJ_PATH)/ai_engine_module/*.cpp) \ |