From 94e704acde59df60bd42f6f90b94d462d1bfa37c Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期日, 23 七月 2017 12:09:41 +0800
Subject: [PATCH] 

---
 VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt |  128 +++++++++++++++++++++++++++++++-----------
 1 files changed, 95 insertions(+), 33 deletions(-)

diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
index d0d7af3..4a466a3 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
@@ -1,50 +1,112 @@
 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_OPENCV -DUSE_ST_SDK -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")
+
+set(WORKSPACE_PATH "D:/workspace/proxy")
 
 add_library(rtspface SHARED
-            RtspNativeCodecJNI.cpp
-            CameraWrapper.cpp
-            FaceCache.cpp
+			RtspNativeCodecJNI.cpp
+			CameraWrapper.cpp
+			FaceCache.cpp
+			FaceCacheForPLBG.cpp
+			DebugNetwork.cpp
+			CaptureCamera.cpp
+			cpu_sched_test.cpp
+			serial.c
+			#TeleWrapper.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"
-            )
+			"D:/workspace/proxy/RtspFace/PipeLine.cpp"
+			"D:/workspace/proxy/RtspFace/Logger/src/logger.cc"
+			"D:/workspace/proxy/RtspFace/MediaHelper.cpp"
+			"D:/workspace/proxy/RtspFace/GraphicHelper.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/RtspFace/PL_Gainer.cpp"
+            "D:/workspace/proxy/RtspFace/PL_Scale.cpp"
+			"D:/workspace/proxy/RtspFace/PL_ColorConv.cpp"
+			"D:/workspace/proxy/RtspFace/PL_Paint.cpp"
+			"D:/workspace/proxy/RtspFace/PL_V4L2Source.cpp"
+			"D:/workspace/proxy/RtspFace/PL_BlockGrouping.cpp"
+			#"D:/workspace/proxy/RtspFace/PL_Queue.cpp"
+			#"D:/workspace/proxy/RtspFace/PL_Fork2.cpp"
+
+			"D:/workspace/proxy/FaceServer/proto_hton_ntoh.cpp"
+			"D:/workspace/proxy/FaceServer/PbFaceList.pb.cc"
+
+			 "D:/workspace/proxy/RtspFace/libv4l2cpp/src/V4l2Capture.cpp"
+			 "D:/workspace/proxy/RtspFace/libv4l2cpp/src/V4l2Device.cpp"
+			 "D:/workspace/proxy/RtspFace/libv4l2cpp/src/V4l2MmapDevice.cpp"
+			 "D:/workspace/proxy/RtspFace/libv4l2cpp/src/V4l2Output.cpp"
+
+			#"D:/workspace/proxy/RtspFace/CvUtil/CvxText.cpp"
+
+			)
 
 # Include libraries needed for native-codec-jni lib
 target_link_libraries(rtspface
-                      android
-                      log
-                      mediandk
-                      OpenMAXAL)
+					  android
+					  log
+					  #ui
+					  mediandk
+					  #OpenMAXAL
+					  #jnigraphics
+					  #EGL
+					  #GLESv2
+					  #GLESv3
+					  )
 
-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"
+include_directories(
+					"D:/workspace/proxy/RtspFace"
+					"D:/workspace/proxy/FaceServer"
 
-                    "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libyuv/include"
+					#"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/opencv/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/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/include"
-                    )
+					"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libyuv/include"
+
+					"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"
+
+					"D:/workspace/proxy/RtspFace/libv4l2cpp/inc"
+					#"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libv4l2wrapper/include"
+
+					"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/freetype/include/freetype2"
+					)
 
 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/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/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/freetype/lib/arm64-v8a/libfreetype.so"
 
-                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/lib/armeabi-v7a/libopencv_java3.so"
+					  #"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libv4l2wrapper/lib/armeabi-v7a/libv4l2wrapper.a"
 
-                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/libs/armeabi-v7a/libcvface_api.so"
-                      )
-
-include_directories("D:/workspace/proxy/RtspFace")
+					  #"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