From afcb649c8a2785c6095be5762c6077f9e15afd1a Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 02 八月 2017 10:33:31 +0800
Subject: [PATCH] c++ dupl image

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

diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
index 4a466a3..8511bca 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
@@ -7,6 +7,7 @@
 #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")
+set(ARCH "armeabi-v7a")
 
 add_library(rtspface SHARED
 			RtspNativeCodecJNI.cpp
@@ -17,34 +18,35 @@
 			CaptureCamera.cpp
 			cpu_sched_test.cpp
 			serial.c
-			#TeleWrapper.cpp
+			TeleWrapper.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"
+			"${WORKSPACE_PATH}/RtspFace/PipeLine.cpp"
+			"${WORKSPACE_PATH}/RtspFace/Logger/src/logger.cc"
+			"${WORKSPACE_PATH}/RtspFace/MediaHelper.cpp"
+			"${WORKSPACE_PATH}/RtspFace/GraphicHelper.cpp"
+			"${WORKSPACE_PATH}/RtspFace/PL_RTSPClient.cpp"
+			"${WORKSPACE_PATH}/RtspFace/PL_AndroidMediaCodecDecoder_ndk.cpp"
+			"${WORKSPACE_PATH}/RtspFace/PL_AndroidSurfaceViewRender.cpp"
+			"${WORKSPACE_PATH}/RtspFace/PL_SensetimeFaceTrackMultiTrd.cpp"
+			"${WORKSPACE_PATH}/RtspFace/PL_Gainer.cpp"
+            "${WORKSPACE_PATH}/RtspFace/PL_Scale.cpp"
+			"${WORKSPACE_PATH}/RtspFace/PL_ColorConv.cpp"
+			"${WORKSPACE_PATH}/RtspFace/PL_Paint.cpp"
+			"${WORKSPACE_PATH}/RtspFace/PL_V4L2Source.cpp"
+			"${WORKSPACE_PATH}/RtspFace/PL_BlockGrouping.cpp"
+			#"${WORKSPACE_PATH}/RtspFace/PL_Queue.cpp"
+			#"${WORKSPACE_PATH}/RtspFace/PL_Fork2.cpp"
+			"${WORKSPACE_PATH}/RtspFace/PL_AndroidMediaCodecEncoder.cpp"
 
-			"D:/workspace/proxy/FaceServer/proto_hton_ntoh.cpp"
-			"D:/workspace/proxy/FaceServer/PbFaceList.pb.cc"
+			"${WORKSPACE_PATH}/FaceServer/proto_hton_ntoh.cpp"
+			"${WORKSPACE_PATH}/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"
+			 "${WORKSPACE_PATH}/RtspFace/libv4l2cpp/src/V4l2Capture.cpp"
+			 "${WORKSPACE_PATH}/RtspFace/libv4l2cpp/src/V4l2Device.cpp"
+			 "${WORKSPACE_PATH}/RtspFace/libv4l2cpp/src/V4l2MmapDevice.cpp"
+			 "${WORKSPACE_PATH}/RtspFace/libv4l2cpp/src/V4l2Output.cpp"
 
-			#"D:/workspace/proxy/RtspFace/CvUtil/CvxText.cpp"
+			"${WORKSPACE_PATH}/RtspFace/CvUtil/CvxText.cpp"
 
 			)
 
@@ -62,8 +64,8 @@
 					  )
 
 include_directories(
-					"D:/workspace/proxy/RtspFace"
-					"D:/workspace/proxy/FaceServer"
+					"${WORKSPACE_PATH}/RtspFace"
+					"${WORKSPACE_PATH}/FaceServer"
 
 					#"D:/workspace/libhardware-android-5.1.1_r38/include"
 					#"D:/workspace/core-android-5.1.1_r38/include"
@@ -71,42 +73,49 @@
 					#"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"
+					"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/include"
+					"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/include/BasicUsageEnvironment"
+					"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/include/groupsock"
+					"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/include/liveMedia"
+					"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/include/UsageEnvironment"
 
-					"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libyuv/include"
+					"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/libyuv/include"
 
-					"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/include"
+					"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/opencv/include"
 
-					"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/include"
+					"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/protobuf/include"
 
-					"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/include"
+					"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/st_face/include"
+					
+					"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/include"
 
-					"D:/workspace/proxy/RtspFace/libv4l2cpp/inc"
-					#"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libv4l2wrapper/include"
+					"${WORKSPACE_PATH}/RtspFace/libv4l2cpp/inc"
+					#"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/libv4l2wrapper/include"
 
-					"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/freetype/include/freetype2"
+					"${WORKSPACE_PATH}/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"
+					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/lib/${ARCH}/libliveMedia.a"
+					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/lib/${ARCH}/libgroupsock.a"
+					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/lib/${ARCH}/libBasicUsageEnvironment.a"
+					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/lib/${ARCH}/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"
-					  #"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/freetype/lib/arm64-v8a/libfreetype.so"
+					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/libyuv/lib/${ARCH}/libyuv_static.a"
+					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/opencv/lib/${ARCH}/libopencv_java3.so"
+					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/protobuf/lib/${ARCH}/libprotobuf.so"
+					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/st_face/lib/${ARCH}/libcvface_api.so"
+					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/freetype/lib/${ARCH}/libfreetype.so"
 
-					  #"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libv4l2wrapper/lib/armeabi-v7a/libv4l2wrapper.a"
+					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-0.6.1.so"
+					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnpc-0.6.1.so"
+					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj-0.6.1.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"
+
+					  #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/libv4l2wrapper/lib/${ARCH}/libv4l2wrapper.a"
+
+					  #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libgui.so"
+					  #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libui.so"
+					  #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libEGL.so"
+					  #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libGLESv3.so"
 					  )

--
Gitblit v1.8.0