From 521e435d5d63fc76097e6667ba5ef9bcd1393a7b Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 四月 2017 16:35:32 +0800
Subject: [PATCH] bug fix
---
VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
index 7674ae3..418a860 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
@@ -1,22 +1,27 @@
cmake_minimum_required(VERSION 3.4.1)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -std=c++11 -DUSE_ST_SDK -DUSE_OPENCV -Wall -UNDEBUG")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -std=c++11 -DUSE_ST_SDK -DUSE_OPENCV -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 -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")
add_library(rtspface SHARED
RtspNativeCodecJNI.cpp
CameraWrapper.cpp
FaceCache.cpp
PbFaceList.pb.cc
+ DebugNetwork.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/PL_RTSPClient.cpp"
"D:/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp"
+ "D:/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp"
"D:/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp"
+
+ "D:/workspace/proxy/FaceServer/proto_hton_ntoh.cpp"
)
# Include libraries needed for native-codec-jni lib
@@ -24,9 +29,14 @@
android
log
mediandk
- OpenMAXAL)
+ OpenMAXAL
+ #gui
+ jnigraphics
+ )
-include_directories("D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include"
+include_directories("D:/workspace/proxy/FaceServer"
+
+ "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"
--
Gitblit v1.8.0