From 0688756b71b40e0ac60c68af2fa1fe4aaeb1718d Mon Sep 17 00:00:00 2001 From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674> Date: 星期一, 13 二月 2017 16:27:41 +0800 Subject: [PATCH] replace log to support android --- RtspFace/make.sh | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/RtspFace/make.sh b/RtspFace/make.sh index f534195..1fa56b8 100644 --- a/RtspFace/make.sh +++ b/RtspFace/make.sh @@ -33,13 +33,12 @@ DLIB_INC="-I$DLIB_BASE" DLIB_LIB="-L$DLIB_BASE/build/dlib -ldlib" -LIBLOG4CPP_BASE=/opt/log4cpp/inst -LIBLOG4CPP_INC="-I$LIBLOG4CPP_BASE/include" -LIBLOG4CPP_LIB="-L$LIBLOG4CPP_BASE/lib -llog4cpp" +LOGGER_BASE=./Logger/src +LOGGER_OBJ="logger.o" # -O3 -CPPFLAGS+="-g -mavx -c -std=c++11 -pthread $LIVEMEDIA_INC $FFMPEG_INC $LIBBASE64_INC $LIBYUV_INC $SENSETIMEFACESDK_INC $LIBLOG4CPP_INC $DLIB_INC " -LDFLAGS+="-pthread -levent $LIVEMEDIA_LIB $FFMPEG_LIB $LIBBASE64_LIB $LIBYUV_LIB $LIBX264_LIB $SENSETIMEFACESDK_LIB $OPENCV_LIB $LIBLOG4CPP_LIB $DLIB_LIB " +CPPFLAGS+="-g -mavx -c -std=c++11 -pthread $LIVEMEDIA_INC $FFMPEG_INC $LIBBASE64_INC $LIBYUV_INC $SENSETIMEFACESDK_INC $LIBLOG4CPLUS_INC $DLIB_INC " +LDFLAGS+="-pthread -levent $LIVEMEDIA_LIB $FFMPEG_LIB $LIBBASE64_LIB $LIBYUV_LIB $LIBX264_LIB $SENSETIMEFACESDK_LIB $OPENCV_LIB $LIBLOG4CPLUS_LIB $DLIB_LIB " CFLAGS+="-D__STDC_CONSTANT_MACROS" @@ -56,6 +55,8 @@ g++ ev_server.cpp $CFLAGS $CPPFLAGS g++ PipeLine.cpp $CFLAGS $CPPFLAGS g++ PipeLinePool.cpp $CFLAGS $CPPFLAGS + +g++ $LOGGER_BASE/logger.cc $CFLAGS $CPPFLAGS g++ PL_RTSPClient.cpp $CFLAGS $CPPFLAGS g++ PL_RTSPServer.cpp $CFLAGS $CPPFLAGS @@ -83,6 +84,7 @@ g++ -g -std=c++11 \ main.o PipeLine.o PipeLinePool.o \ + $LOGGER_OBJ \ ev_server.o \ PL_RTSPClient.o PL_H264Decoder.o PL_H264Encoder.o PL_AVFrameYUV420.o PL_AVFrameBGRA.o PL_Queue.o PL_Scale.o PL_Fork.o PL_Payer.o PL_Gainer.o \ PL_SensetimeFaceTrack.o PL_SensetimeFaceDetect.o \ @@ -91,6 +93,6 @@ FaceDBPool.o faceAPI.o \ $LDFLAGS -o rtsp_face -#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBX264_BASE/lib:$FFMPEG_BASE/lib:$SENSETIMEFACESDK_BASE/libs/linux-x86_64:$LIBLOG4CPP_BASE/lib:$DLIB_BASE/build/dlib +#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBX264_BASE/lib:$FFMPEG_BASE/lib:$SENSETIMEFACESDK_BASE/libs/linux-x86_64:$LOGGER_BASE/lib64:$DLIB_BASE/build/dlib #./rtsp_face rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/main/av_stream #rtsp://admin:a1234567@192.168.1.68:554/h264/ch1/main/av_stream -- Gitblit v1.8.0