From 2ae0446917184b36996823e9dbf452dba82e8994 Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期五, 21 四月 2017 12:31:44 +0800 Subject: [PATCH] --- VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt index f18a0c8..e59e4a2 100644 --- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt +++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt @@ -1,17 +1,24 @@ cmake_minimum_required(VERSION 3.4.1) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -Wall -UNDEBUG") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -std=c++11 -DUSE_ST_SDK -DUSE_OPENCV -DANDROID_PLATFORM=android-22 -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG") + +#debug for video only test +#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -std=c++11 -fno-rtti -Wall -UNDEBUG") +#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -std=c++11 -DANDROID_PLATFORM=android-22 -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG") add_library(rtspface SHARED RtspNativeCodecJNI.cpp CameraWrapper.cpp FaceCache.cpp + PbFaceList.pb.cc "D:/workspace/proxy/RtspFace/PipeLine.cpp" "D:/workspace/proxy/RtspFace/Logger/src/logger.cc" + "D:/workspace/proxy/RtspFace/MediaHelper.cpp" "D:/workspace/proxy/RtspFace/PL_RTSPClient.cpp" "D:/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp" - "D:/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp" + "D:/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp" + "D:/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp" ) # Include libraries needed for native-codec-jni lib @@ -19,7 +26,10 @@ android log mediandk - OpenMAXAL) + OpenMAXAL + #gui + jnigraphics + ) include_directories("D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include" "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/BasicUsageEnvironment" @@ -31,6 +41,8 @@ "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/include" + "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/include" + "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/include" ) @@ -41,10 +53,9 @@ "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libUsageEnvironment.a" "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libyuv/lib/armeabi-v7a/libyuv_static.a" - - "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/lib/android-armv7/libopencv_java3.so" - - "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/libs/android-armv7/libcvface_api.so" + "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/lib/armeabi-v7a/libopencv_java3.so" + "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/lib/armeabi-v7a/libprotobuf.so" + "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/lib/armeabi-v7a/libcvface_api.so" ) include_directories("D:/workspace/proxy/RtspFace") -- Gitblit v1.8.0