From b09911d555613ac8bd306367660bd9b1425ad3c5 Mon Sep 17 00:00:00 2001 From: Hu Chunming <2657262686@qq.com> Date: Thu, 1 Aug 2024 14:37:58 +0800 Subject: [PATCH] 更新makefile，注意USE_VILLAGE未启用，后续要启用 --- build/src/Makefile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/build/src/Makefile b/build/src/Makefile index 1e9672c..b239585 100755 --- a/build/src/Makefile +++ b/build/src/Makefile @@ -18,9 +18,8 @@ AUTHORITY_DIR = $(THIRDPARTY_ROOT)/atlas_lic-aarch64-20220112/atlas_lic BOOST_ROOT = $(THIRDPARTY_ROOT)/boost_1_81_0/release WEBSOCKETPP_ROOT = $(THIRDPARTY_ROOT)/websocketpp-0.8.2/release/include \ -JRTP_ROOT = $(THIRDPARTY_ROOT)/gb28181_3rd/jrtp_export - -DEFS = -DENABLE_DVPP_INTERFACE -DWITH_FACE_DET_SS -DPOST_USE_RABBITMQ -DUSE_VILLAGE +DEFS = -DENABLE_DVPP_INTERFACE -DWITH_FACE_DET_SS -DPOST_USE_RABBITMQ +# -DUSE_VILLAGE # DEFS = -DENABLE_DVPP_INTERFACE -DUSE_VILLAGE 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 \ -I $(FFMPEG_ROOT)/include \ -I $(RABBITMQ_CLIENT_ROOT)/include \ -I $(AUTHORITY_DIR)/include \ - -I $(JRTP_ROOT)/jrtplib/include/jrtplib3 \ - -I $(SRC_ROOT)/decoder/gb28181/rtp \ + -I $(SRC_ROOT)/decoder/gb28181/rtp2 \ -I $(SRC_ROOT)/decoder/gb28181 \ -I $(WEBSOCKETPP_ROOT) \ -I $(BOOST_ROOT)/include \ @@ -42,10 +40,9 @@ LIBS= -L $(SPDLOG_ROOT)/lib -l:libspdlog.a \ -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\ -L $(OPENCV_ROOT)/lib -lopencv_world\ -L $(JSON_ROOT)/lib -l:libjsoncpp.a \ - -L $(FFMPEG_ROOT)/lib -lavformat -lavcodec -lswscale -lavutil -lavfilter -lswresample -lavdevice -lx264\ + -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\ -L $(RABBITMQ_CLIENT_ROOT)/lib/aarch64-linux-gnu -l:librabbitmq.a \ -L $(AUTHORITY_DIR)/lib -latlaslic \ - -L $(JRTP_ROOT)/jrtplib/lib -l:libjrtp.a \ -L/usr/local/Ascend/ascend-toolkit/6.3.RC1/runtime/lib64 -lacl_dvpp -lascendcl \ -L $(BOOST_ROOT)/lib -lboost_system \ @@ -64,7 +61,7 @@ SRCS:=$(wildcard $(SRC_ROOT)/ai_platform/*.cpp) \ $(wildcard $(SRC_ROOT)/reprocessing_module/*.cpp) \ $(wildcard $(SRC_ROOT)/reprocessing_module/rbmq/*.cpp) \ $(wildcard $(SRC_ROOT)/decoder/gb28181/*.cpp) \ - $(wildcard $(SRC_ROOT)/decoder/gb28181/rtp/*.cpp) \ + $(wildcard $(SRC_ROOT)/decoder/gb28181/rtp2/*.cpp) \ $(wildcard $(SRC_ROOT)/decoder/gb28181/Message/*.cpp) \ $(wildcard $(SRC_ROOT)/decoder/gb28181/tinyxml2/*.cpp) \ $(wildcard $(SRC_ROOT)/decoder/gb28181/websocket/*.cpp) \ @@ -104,7 +101,7 @@ $(TARGET):$(OBJS) %.o:$(SRC_ROOT)/decoder/gb28181/%.cpp $(XX) $(CXXFLAGS) -c $< -%.o:$(SRC_ROOT)/decoder/gb28181/rtp/%.cpp +%.o:$(SRC_ROOT)/decoder/gb28181/rtp2/%.cpp $(XX) $(CXXFLAGS) -c $< %.o:$(SRC_ROOT)/decoder/gb28181/websocket/%.cpp -- libgit2 0.21.4