From 2a2f6b1229a0eaf18a0eee67fd3d17d1f9e8420b Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 07 三月 2017 12:08:49 +0800
Subject: [PATCH] 

---
 VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt |   35 +++++++++++++++++++++--------------
 1 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
index bb520d7..2acf0b0 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
@@ -14,23 +14,30 @@
                       mediandk
                       OpenMAXAL)
 
-include_directories("D:/workspace/proxy/RtspNativeCodec/app/libs/live555/include"
-                    "D:/workspace/proxy/RtspNativeCodec/app/libs/live555/include/BasicUsageEnvironment"
-                    "D:/workspace/proxy/RtspNativeCodec/app/libs/live555/include/groupsock"
-                    "D:/workspace/proxy/RtspNativeCodec/app/libs/live555/include/liveMedia"
-                    "D:/workspace/proxy/RtspNativeCodec/app/libs/live555/include/UsageEnvironment")
+include_directories("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")
 
 target_link_libraries(native-codec-jni
-                      "D:/workspace/proxy/RtspNativeCodec/app/libs/live555/lib/libliveMedia.a"
-                      "D:/workspace/proxy/RtspNativeCodec/app/libs/live555/lib/libgroupsock.a"
-                      "D:/workspace/proxy/RtspNativeCodec/app/libs/live555/lib/libBasicUsageEnvironment.a"
-                      "D:/workspace/proxy/RtspNativeCodec/app/libs/live555/lib/libUsageEnvironment.a")
+                      "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")
 
 include_directories("D:/workspace/proxy/RtspFace")
 
-#add_library(rtspface STATIC
-#            "D:/workspace/proxy/RtspFace/PipeLine.cpp"
-#            "D:/workspace/proxy/RtspFace/PipeLinePool.cpp"
-#            "D:/workspace/proxy/RtspFace/PL_RTSPClient.cpp")
+add_library(rtspface STATIC
+            "D:/workspace/proxy/RtspFace/PipeLine.cpp"
+            "D:/workspace/proxy/RtspFace/PL_RTSPClient.cpp")
+target_link_libraries(native-codec-jni rtspface)
 
-# 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