From 1c0f255b682a3ff33804f177f5936eb0624555c8 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 23 三月 2017 13:56:55 +0800
Subject: [PATCH]
---
VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt | 43 +++++++++++++++++++++----------------------
1 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
index 2acf0b0..e698ad8 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
@@ -2,13 +2,19 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -UNDEBUG")
-add_library(native-codec-jni SHARED
- looper.cpp
- native-codec-jni.cpp
- "D:/workspace/proxy/RtspFace/Logger/src/logger.cc")
+add_library(rtspface SHARED
+ RtspNativeCodecJNI.cpp
+ CameraWrapper.cpp
+
+ "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 +26,17 @@
"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/liveMedia"
"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/UsageEnvironment"
+ "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/include"
+
"D:/workspace/JniHelpers/src/main/cpp")
-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")
+target_link_libraries(rtspface
+ "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/x86/libliveMedia.a"
+ "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/x86/libgroupsock.a"
+ "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/x86/libBasicUsageEnvironment.a"
+ "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/x86/libUsageEnvironment.a"
+
+ #"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/libs/android-armv7/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