From a5fc9f0acaa8b92c8d78f060cd4cdabab2793c62 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 17 八月 2017 10:30:34 +0800
Subject: [PATCH] merge home base
---
VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt | 25 ++++---------------------
1 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
index 35995bd..f733384 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
@@ -6,8 +6,8 @@
#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:/work/proxy")
-set(ARCH "arm64-v8a")
+set(WORKSPACE_PATH "D:/workspace/proxy")
+set(ARCH "armeabi-v7a")
include_directories(
"${WORKSPACE_PATH}/RtspFace"
@@ -36,9 +36,6 @@
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/include"
- "${WORKSPACE_PATH}/RtspFace/libv4l2cpp/inc"
- #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/libv4l2wrapper/include"
-
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/freetype/include/freetype2"
)
@@ -65,13 +62,13 @@
"${WORKSPACE_PATH}/RtspFace/PL_RTSPClient.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_AndroidMediaCodecDecoder_ndk.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_AndroidSurfaceViewRender.cpp"
+ "${WORKSPACE_PATH}/RtspFace/PL_SensetimeFaceTrack.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_SensetimeFaceTrackMultiTrd.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_SensetimeFaceTrack.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"
@@ -80,11 +77,6 @@
"${WORKSPACE_PATH}/FaceServer/proto_hton_ntoh.cpp"
"${WORKSPACE_PATH}/FaceServer/PbFaceList.pb.cc"
-
- "${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"
"${WORKSPACE_PATH}/RtspFace/CvUtil/CvxText.cpp"
@@ -125,8 +117,6 @@
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj-0.7-dev.so"
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj-async-0.7-dev.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"
@@ -156,12 +146,12 @@
"${WORKSPACE_PATH}/RtspFace/PL_RTSPClient.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_AndroidMediaCodecDecoder_ndk.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_AndroidSurfaceViewRender.cpp"
+ "${WORKSPACE_PATH}/RtspFace/PL_SensetimeFaceTrack.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"
@@ -169,11 +159,6 @@
"${WORKSPACE_PATH}/FaceServer/proto_hton_ntoh.cpp"
"${WORKSPACE_PATH}/FaceServer/PbFaceList.pb.cc"
-
- "${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"
"${WORKSPACE_PATH}/RtspFace/CvUtil/CvxText.cpp"
@@ -210,8 +195,6 @@
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnpc-0.7-dev.so"
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj-0.7-dev.so"
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj-async-0.7-dev.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"
--
Gitblit v1.8.0