From 6304e6c25e3d24797497a88f99ce79ce6fd8f27e Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 06 四月 2017 15:44:31 +0800
Subject: [PATCH] 

---
 VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt |   61 ++++++++++++++++++------------
 1 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
index 2acf0b0..7674ae3 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
@@ -1,14 +1,26 @@
 cmake_minimum_required(VERSION 3.4.1)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -UNDEBUG")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -std=c++11 -DUSE_ST_SDK -DUSE_OPENCV  -Wall -UNDEBUG")
 
-add_library(native-codec-jni SHARED
-            looper.cpp
-            native-codec-jni.cpp
-            "D:/workspace/proxy/RtspFace/Logger/src/logger.cc")
+#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  -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/PL_RTSPClient.cpp"
+            "D:/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp"
+            "D:/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp"
+            )
 
 # Include libraries needed for native-codec-jni lib
-target_link_libraries(native-codec-jni
+target_link_libraries(rtspface
                       android
                       log
                       mediandk
@@ -20,24 +32,25 @@
                     "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/liveMedia"
                     "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/UsageEnvironment"
 
-                    "D:/workspace/JniHelpers/src/main/cpp")
+                    "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libyuv/include"
 
-target_link_libraries(native-codec-jni
-                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/libliveMedia.a"
-                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/libgroupsock.a"
-                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/libBasicUsageEnvironment.a"
-                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/libUsageEnvironment.a")
+                    "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"
+                    )
+
+target_link_libraries(rtspface
+                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libliveMedia.a"
+                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libgroupsock.a"
+                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libBasicUsageEnvironment.a"
+                      "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/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")
-
-add_library(rtspface STATIC
-            "D:/workspace/proxy/RtspFace/PipeLine.cpp"
-            "D:/workspace/proxy/RtspFace/PL_RTSPClient.cpp")
-target_link_libraries(native-codec-jni rtspface)
-
-
-#file(GLOB libJniHelpers_SOURCES D:/workspace/JniHelpers/src/main/cpp/*.cpp)
-#file(GLOB libJniHelpers_HEADERS D:/workspace/JniHelpers/src/main/cpp/*.h)
-#add_library(JniHelpers ${libJniHelpers_SOURCES} ${libJniHelpers_HEADERS})
-#target_link_libraries(native-codec-jni JniHelpers)
-

--
Gitblit v1.8.0