From 0099eb30902a61a6cfb09d6c899a408cd25b0a5e Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 10 八月 2017 11:42:57 +0800
Subject: [PATCH] add jsoncpp lib
---
VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
index 8922d56..38de31e 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
@@ -6,7 +6,7 @@
#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 "E:/Documents/works")
+set(WORKSPACE_PATH "D:/workspace/proxy")
set(ARCH "arm64-v8a")
include_directories(
@@ -44,6 +44,7 @@
add_library(rtspface_server SHARED
RtspNativeCodecJNIServer.cpp
+ RemoteMethod.capnp.cpp
RemoteFuncServer.cpp
RemoteFunc.cpp
CameraWrapperServer.cpp
@@ -54,12 +55,12 @@
cpu_sched_test.cpp
serial.c
TeleWrapper.cpp
- RemoteMethod.proto.cpp
AppConfig.cpp
"${WORKSPACE_PATH}/RtspFace/PipeLine.cpp"
"${WORKSPACE_PATH}/RtspFace/Logger/src/logger.cc"
"${WORKSPACE_PATH}/RtspFace/MediaHelper.cpp"
+ "${WORKSPACE_PATH}/RtspFace/PreAllocBufferQueue.cpp"
"${WORKSPACE_PATH}/RtspFace/GraphicHelper.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_RTSPClient.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_AndroidMediaCodecDecoder_ndk.cpp"
@@ -89,6 +90,7 @@
"${WORKSPACE_PATH}/RtspFace/FFmpegRTSPServer/LiveServerMediaSubsession.cpp"
"${WORKSPACE_PATH}/RtspFace/FFmpegRTSPServer/LiveRTSPServer.cpp"
"${WORKSPACE_PATH}/RtspFace/FFmpegRTSPServer/FFmpegH264Source.cpp"
+ "${WORKSPACE_PATH}/RtspFace/FFmpegRTSPServer/H264FramedSource.cpp"
)
# Include libraries needed for native-codec-jni lib
@@ -113,12 +115,14 @@
"${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}/libcapnp-json.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-rpc.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/libv4l2wrapper/lib/${ARCH}/libv4l2wrapper.a"
#"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libgui.so"
@@ -130,6 +134,7 @@
add_library(rtspface_client SHARED
RtspNativeCodecJNIClient.cpp
+ RemoteMethod.capnp.cpp
RemoteFuncClient.cpp
RemoteFunc.cpp
CameraWrapperClient.cpp
@@ -140,7 +145,6 @@
cpu_sched_test.cpp
serial.c
TeleWrapper.cpp
- RemoteMethod.proto.cpp
AppConfig.cpp
"${WORKSPACE_PATH}/RtspFace/PipeLine.cpp"
@@ -196,12 +200,16 @@
"${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}/libcapnp-json.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-rpc.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/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