From 109ffe9a777658936a38d0c146579a67c60a0d17 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 11 五月 2017 17:48:48 +0800
Subject: [PATCH] 

---
 VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt |   83 ++++++++++++++++++++++++++++++-----------
 1 files changed, 60 insertions(+), 23 deletions(-)

diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
index 2acf0b0..6fd84d2 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
@@ -1,43 +1,80 @@
 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_OPENCV -DUSE_ST_SDK -DANDROID_PLATFORM=android-22  -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static  -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 -DANDROID_PLATFORM=android-22  -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG")
+
+add_library(rtspface SHARED
+            RtspNativeCodecJNI.cpp
+            CameraWrapper.cpp
+            FaceCache.cpp
+            DebugNetwork.cpp
+
+            "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_ndk.cpp"
+            "D:/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp"
+            "D:/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp"
+
+            "D:/workspace/proxy/FaceServer/proto_hton_ntoh.cpp"
+            "D:/workspace/proxy/FaceServer/PbFaceList.pb.cc"
+            )
 
 # Include libraries needed for native-codec-jni lib
-target_link_libraries(native-codec-jni
+target_link_libraries(rtspface
                       android
                       log
+                      #ui
                       mediandk
-                      OpenMAXAL)
+                      #OpenMAXAL
+					  #jnigraphics
+					  #EGL
+					  #GLESv2
+					  #GLESv3
+					  )
 
-include_directories("D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include"
+include_directories(
+                    "D:/workspace/proxy/RtspFace"
+                    "D:/workspace/proxy/FaceServer"
+
+                    #"D:/workspace/libhardware-android-5.1.1_r38/include"
+                    #"D:/workspace/core-android-5.1.1_r38/include"
+                    #"D:/workspace/native-android-5.1.1_r38/include"
+                    #"D:/workspace/core-android-5.1.1_r38/libsync/include"
+                    #"D:/workspace/native-android-5.1.1_r38/opengl/include"
+
+                    "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include"
                     "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/BasicUsageEnvironment"
                     "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/groupsock"
                     "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"
 
-include_directories("D:/workspace/proxy/RtspFace")
+                    "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/include"
 
-add_library(rtspface STATIC
-            "D:/workspace/proxy/RtspFace/PipeLine.cpp"
-            "D:/workspace/proxy/RtspFace/PL_RTSPClient.cpp")
-target_link_libraries(native-codec-jni rtspface)
+                    "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"
 
-#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)
+                      "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"
 
+                      #"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/android_sys/libgui.so"
+                      #"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/android_sys/libui.so"
+                      #"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/android_sys/libEGL.so"
+                      #"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/android_sys/libGLESv3.so"
+                      )

--
Gitblit v1.8.0