From a188ad2e23ef190c8a044b17bc467fa3e2ae0ca5 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 16 八月 2017 17:59:14 +0800
Subject: [PATCH] aaaaa
---
VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
index ab715f3..35995bd 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
@@ -6,7 +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:/workspace/proxy")
+set(WORKSPACE_PATH "D:/work/proxy")
+set(ARCH "arm64-v8a")
include_directories(
"${WORKSPACE_PATH}/RtspFace"
@@ -43,6 +44,7 @@
add_library(rtspface_server SHARED
RtspNativeCodecJNIServer.cpp
+ RemoteMethod.capnp.cpp
RemoteFuncServer.cpp
RemoteFunc.cpp
CameraWrapperServer.cpp
@@ -53,7 +55,6 @@
cpu_sched_test.cpp
serial.c
TeleWrapper.cpp
- RemoteMethod.proto.cpp
AppConfig.cpp
"${WORKSPACE_PATH}/RtspFace/PipeLine.cpp"
@@ -65,6 +66,7 @@
"${WORKSPACE_PATH}/RtspFace/PL_AndroidMediaCodecDecoder_ndk.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_AndroidSurfaceViewRender.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"
@@ -74,7 +76,7 @@
#"${WORKSPACE_PATH}/RtspFace/PL_Queue.cpp"
#"${WORKSPACE_PATH}/RtspFace/PL_Fork2.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_AndroidMediaCodecEncoder.cpp"
- "${WORKSPACE_PATH}/RtspFace/PL_RTSPServer.cpp"
+ "${WORKSPACE_PATH}/RtspFace/PL_RTSPServer2.cpp"
"${WORKSPACE_PATH}/FaceServer/proto_hton_ntoh.cpp"
"${WORKSPACE_PATH}/FaceServer/PbFaceList.pb.cc"
@@ -114,12 +116,15 @@
"${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"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/jsoncpp/lib/${ARCH}/libjsoncpp.so"
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp.so"
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnpc.so"
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-0.7-dev.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-json-0.7-dev.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-rpc-0.7-dev.so"
+ "${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/jsoncpp/lib/${ARCH}/libjsoncpp.so"
#"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/libv4l2wrapper/lib/${ARCH}/libv4l2wrapper.a"
#"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libgui.so"
@@ -131,6 +136,7 @@
add_library(rtspface_client SHARED
RtspNativeCodecJNIClient.cpp
+ RemoteMethod.capnp.cpp
RemoteFuncClient.cpp
RemoteFunc.cpp
CameraWrapperClient.cpp
@@ -141,7 +147,6 @@
cpu_sched_test.cpp
serial.c
TeleWrapper.cpp
- RemoteMethod.proto.cpp
AppConfig.cpp
"${WORKSPACE_PATH}/RtspFace/PipeLine.cpp"
@@ -197,12 +202,17 @@
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/st_face/lib/${ARCH}/libcvface_api.so"
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/freetype/lib/${ARCH}/libfreetype.so"
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp.so"
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnpc.so"
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/jsoncpp/lib/${ARCH}/libjsoncpp.so"
- #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/jsoncpp/lib/${ARCH}/libjsoncpp.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-0.7-dev.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-json-0.7-dev.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-rpc-0.7-dev.so"
+ "${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"
#"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libEGL.so"
--
Gitblit v1.8.0