Hu Chunming / vpt_ascend_arm

Commit b09911d555613ac8bd306367660bd9b1425ad3c5

Authored by Hu Chunming
1 parent 7d529db7

更新makefile，注意USE_VILLAGE未启用，后续要启用

Inline Side-by-side
Showing 1 changed file with 6 additions and 9 deletions
build/src/Makefile
  View file @b09911d
@@ -18,9 +18,8 @@ AUTHORITY_DIR = $(THIRDPARTY_ROOT)/atlas_lic-aarch64-20220112/atlas_lic @@ -18,9 +18,8 @@ AUTHORITY_DIR = $(THIRDPARTY_ROOT)/atlas_lic-aarch64-20220112/atlas_lic
18 BOOST_ROOT = $(THIRDPARTY_ROOT)/boost_1_81_0/release 18 BOOST_ROOT = $(THIRDPARTY_ROOT)/boost_1_81_0/release
19 WEBSOCKETPP_ROOT = $(THIRDPARTY_ROOT)/websocketpp-0.8.2/release/include \ 19 WEBSOCKETPP_ROOT = $(THIRDPARTY_ROOT)/websocketpp-0.8.2/release/include \
20 20
21 -JRTP_ROOT = $(THIRDPARTY_ROOT)/gb28181_3rd/jrtp_export  
22 -  
23 -DEFS = -DENABLE_DVPP_INTERFACE -DWITH_FACE_DET_SS -DPOST_USE_RABBITMQ -DUSE_VILLAGE 21 +DEFS = -DENABLE_DVPP_INTERFACE -DWITH_FACE_DET_SS -DPOST_USE_RABBITMQ
  22 +# -DUSE_VILLAGE
24 # DEFS = -DENABLE_DVPP_INTERFACE -DUSE_VILLAGE 23 # DEFS = -DENABLE_DVPP_INTERFACE -DUSE_VILLAGE
25 24
26 include_dir=-I/usr/local/Ascend/ascend-toolkit/6.3.RC1/aarch64-linux/include \ 25 include_dir=-I/usr/local/Ascend/ascend-toolkit/6.3.RC1/aarch64-linux/include \
@@ -31,8 +30,7 @@ include_dir=-I/usr/local/Ascend/ascend-toolkit/6.3.RC1/aarch64-linux/include \ @@ -31,8 +30,7 @@ include_dir=-I/usr/local/Ascend/ascend-toolkit/6.3.RC1/aarch64-linux/include \
31 -I $(FFMPEG_ROOT)/include \ 30 -I $(FFMPEG_ROOT)/include \
32 -I $(RABBITMQ_CLIENT_ROOT)/include \ 31 -I $(RABBITMQ_CLIENT_ROOT)/include \
33 -I $(AUTHORITY_DIR)/include \ 32 -I $(AUTHORITY_DIR)/include \
34 - -I $(JRTP_ROOT)/jrtplib/include/jrtplib3 \  
35 - -I $(SRC_ROOT)/decoder/gb28181/rtp \ 33 + -I $(SRC_ROOT)/decoder/gb28181/rtp2 \
36 -I $(SRC_ROOT)/decoder/gb28181 \ 34 -I $(SRC_ROOT)/decoder/gb28181 \
37 -I $(WEBSOCKETPP_ROOT) \ 35 -I $(WEBSOCKETPP_ROOT) \
38 -I $(BOOST_ROOT)/include \ 36 -I $(BOOST_ROOT)/include \
@@ -42,10 +40,9 @@ LIBS= -L $(SPDLOG_ROOT)/lib -l:libspdlog.a \ @@ -42,10 +40,9 @@ LIBS= -L $(SPDLOG_ROOT)/lib -l:libspdlog.a \
42 -L $(DEPEND_DIR) -lvpt_det_vdec -lsycheck -lface_det_vdec -lhs_tri_process -lhs_truck_process -lphone_motor_det -lhcp_vdec -lmotor_rainshed_vdec -ltraffic_light_vdec -lvehicle_pose_vdec -lroad_seg_vdec -lroad_3clsseg_vdec -lhs_motor_process\ 40 -L $(DEPEND_DIR) -lvpt_det_vdec -lsycheck -lface_det_vdec -lhs_tri_process -lhs_truck_process -lphone_motor_det -lhcp_vdec -lmotor_rainshed_vdec -ltraffic_light_vdec -lvehicle_pose_vdec -lroad_seg_vdec -lroad_3clsseg_vdec -lhs_motor_process\
43 -L $(OPENCV_ROOT)/lib -lopencv_world\ 41 -L $(OPENCV_ROOT)/lib -lopencv_world\
44 -L $(JSON_ROOT)/lib -l:libjsoncpp.a \ 42 -L $(JSON_ROOT)/lib -l:libjsoncpp.a \
45 - -L $(FFMPEG_ROOT)/lib -lavformat -lavcodec -lswscale -lavutil -lavfilter -lswresample -lavdevice -lx264\ 43 + -L $(FFMPEG_ROOT)/lib -l:libavformat.a -l:libavcodec.a -l:libswscale.a -l:libavutil.a -l:libavfilter.a -l:libswresample.a -l:libavdevice.a -l:libx264.a\
46 -L $(RABBITMQ_CLIENT_ROOT)/lib/aarch64-linux-gnu -l:librabbitmq.a \ 44 -L $(RABBITMQ_CLIENT_ROOT)/lib/aarch64-linux-gnu -l:librabbitmq.a \
47 -L $(AUTHORITY_DIR)/lib -latlaslic \ 45 -L $(AUTHORITY_DIR)/lib -latlaslic \
48 - -L $(JRTP_ROOT)/jrtplib/lib -l:libjrtp.a \  
49 -L/usr/local/Ascend/ascend-toolkit/6.3.RC1/runtime/lib64 -lacl_dvpp -lascendcl \ 46 -L/usr/local/Ascend/ascend-toolkit/6.3.RC1/runtime/lib64 -lacl_dvpp -lascendcl \
50 -L $(BOOST_ROOT)/lib -lboost_system \ 47 -L $(BOOST_ROOT)/lib -lboost_system \
51 48
@@ -64,7 +61,7 @@ SRCS:=$(wildcard $(SRC_ROOT)/ai_platform/*.cpp) \ @@ -64,7 +61,7 @@ SRCS:=$(wildcard $(SRC_ROOT)/ai_platform/*.cpp) \
64 $(wildcard $(SRC_ROOT)/reprocessing_module/*.cpp) \ 61 $(wildcard $(SRC_ROOT)/reprocessing_module/*.cpp) \
65 $(wildcard $(SRC_ROOT)/reprocessing_module/rbmq/*.cpp) \ 62 $(wildcard $(SRC_ROOT)/reprocessing_module/rbmq/*.cpp) \
66 $(wildcard $(SRC_ROOT)/decoder/gb28181/*.cpp) \ 63 $(wildcard $(SRC_ROOT)/decoder/gb28181/*.cpp) \
67 - $(wildcard $(SRC_ROOT)/decoder/gb28181/rtp/*.cpp) \ 64 + $(wildcard $(SRC_ROOT)/decoder/gb28181/rtp2/*.cpp) \
68 $(wildcard $(SRC_ROOT)/decoder/gb28181/Message/*.cpp) \ 65 $(wildcard $(SRC_ROOT)/decoder/gb28181/Message/*.cpp) \
69 $(wildcard $(SRC_ROOT)/decoder/gb28181/tinyxml2/*.cpp) \ 66 $(wildcard $(SRC_ROOT)/decoder/gb28181/tinyxml2/*.cpp) \
70 $(wildcard $(SRC_ROOT)/decoder/gb28181/websocket/*.cpp) \ 67 $(wildcard $(SRC_ROOT)/decoder/gb28181/websocket/*.cpp) \
@@ -104,7 +101,7 @@ $(TARGET):$(OBJS) @@ -104,7 +101,7 @@ $(TARGET):$(OBJS)
104 %.o:$(SRC_ROOT)/decoder/gb28181/%.cpp 101 %.o:$(SRC_ROOT)/decoder/gb28181/%.cpp
105 $(XX) $(CXXFLAGS) -c $< 102 $(XX) $(CXXFLAGS) -c $<
106 103
107 -%.o:$(SRC_ROOT)/decoder/gb28181/rtp/%.cpp 104 +%.o:$(SRC_ROOT)/decoder/gb28181/rtp2/%.cpp
108 $(XX) $(CXXFLAGS) -c $< 105 $(XX) $(CXXFLAGS) -c $<
109 106
110 %.o:$(SRC_ROOT)/decoder/gb28181/websocket/%.cpp 107 %.o:$(SRC_ROOT)/decoder/gb28181/websocket/%.cpp