Hu Chunming / vpt_ascend

Commit e25a1c16a34a70e7124686c25da9f7e6ba931a82

Authored by Hu Chunming
1 parent 1fdfff91

编译支持mq

Inline Side-by-side
Showing 2 changed files with 5 additions and 5 deletions
build/demo/Makefile
  View file @e25a1c1
@@ -16,8 +16,8 @@ JSON_ROOT = $(THIRDPARTY_ROOT)/jsoncpp-1.9.5/release @@ -16,8 +16,8 @@ JSON_ROOT = $(THIRDPARTY_ROOT)/jsoncpp-1.9.5/release
16 FFMPEG_ROOT = $(THIRDPARTY_ROOT)/ffmpeg-4.4.4/release 16 FFMPEG_ROOT = $(THIRDPARTY_ROOT)/ffmpeg-4.4.4/release
17 RABBITMQ_CLIENT_ROOT = $(THIRDPARTY_ROOT)/rabbitmq-c-0.11.0/release 17 RABBITMQ_CLIENT_ROOT = $(THIRDPARTY_ROOT)/rabbitmq-c-0.11.0/release
18 18
19 -DEFS = -DENABLE_DVPP_INTERFACE  
20 -# -DPOST_USE_RABBITMQ 19 +DEFS = -DENABLE_DVPP_INTERFACE -DPOST_USE_RABBITMQ
  20 +#
21 21
22 include_dir=-I/usr/local/Ascend/ascend-toolkit/latest/aarch64-linux/include \ 22 include_dir=-I/usr/local/Ascend/ascend-toolkit/latest/aarch64-linux/include \
23 -I $(SPDLOG_ROOT)/include \ 23 -I $(SPDLOG_ROOT)/include \
@@ -32,7 +32,7 @@ LIBS= -L $(DEPEND_DIR) -lvpt_det -lsycheck -lvpt_ascend -lface_det_vdec\ @@ -32,7 +32,7 @@ LIBS= -L $(DEPEND_DIR) -lvpt_det -lsycheck -lvpt_ascend -lface_det_vdec\
32 -L/usr/local/Ascend/ascend-toolkit/latest/runtime/lib64 -lacl_dvpp -lascendcl \ 32 -L/usr/local/Ascend/ascend-toolkit/latest/runtime/lib64 -lacl_dvpp -lascendcl \
33 -L $(FFMPEG_ROOT)/lib -lavformat -lavcodec -lswscale -lavutil -lavfilter -lswresample -lavdevice -lx264\ 33 -L $(FFMPEG_ROOT)/lib -lavformat -lavcodec -lswscale -lavutil -lavfilter -lswresample -lavdevice -lx264\
34 34
35 -CXXFLAGS= -g -O0 -fPIC $(include_dir) $(lib_dir) $(lib) $(LIBS) $(DEFS) -lpthread -lrt -lz -fexceptions -std=c++11 -fvisibility=hidden -Wall -Wno-deprecated -Wdeprecated-declarations -Wl,-Bsymbolic -ldl 35 +CXXFLAGS= -g -O0 -fPIC $(include_dir) $(lib_dir) $(lib) $(LIBS) $(DEFS) -lpthread -lrt -lz -fexceptions -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=0 -fvisibility=hidden -Wall -Wno-deprecated -Wdeprecated-declarations -Wl,-Bsymbolic -ldl
36 36
37 37
38 38
build/src/Makefile
  View file @e25a1c1
@@ -20,8 +20,8 @@ WEBSOCKETPP_ROOT = $(THIRDPARTY_ROOT)/websocketpp-0.8.2/release/include \ @@ -20,8 +20,8 @@ WEBSOCKETPP_ROOT = $(THIRDPARTY_ROOT)/websocketpp-0.8.2/release/include \
20 20
21 JRTP_ROOT = $(THIRDPARTY_ROOT)/gb28181_3rd/jrtp_export 21 JRTP_ROOT = $(THIRDPARTY_ROOT)/gb28181_3rd/jrtp_export
22 22
23 -DEFS = -DENABLE_DVPP_INTERFACE -DWITH_FACE_DET_SS  
24 -# DEFS = -DENABLE_DVPP_INTERFACE -DUSE_VILLAGE -DPOST_USE_RABBITMQ 23 +DEFS = -DENABLE_DVPP_INTERFACE -DWITH_FACE_DET_SS -DPOST_USE_RABBITMQ
  24 +# DEFS = -DENABLE_DVPP_INTERFACE -DUSE_VILLAGE
25 25
26 include_dir=-I/usr/local/Ascend/ascend-toolkit/latest/include \ 26 include_dir=-I/usr/local/Ascend/ascend-toolkit/latest/include \
27 -I $(SRC_ROOT)/common \ 27 -I $(SRC_ROOT)/common \