From a0092014ee12abf06edb1788b189cc7c57336063 Mon Sep 17 00:00:00 2001 From: chenke <chenke@454eff88-639b-444f-9e54-f578c98de674> Date: 星期三, 09 八月 2017 13:42:00 +0800 Subject: [PATCH] Reverse merged revision(s) 988-987 from VisitFace/RtspNativeCodec: JsonCpp和CapnpProtocol功能初步实现 ........ --- VisitFace/DemoForBsk/app/src/main/cpp/CMakeLists.txt | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VisitFace/DemoForBsk/app/src/main/cpp/CMakeLists.txt b/VisitFace/DemoForBsk/app/src/main/cpp/CMakeLists.txt index a857865..31f42b9 100644 --- a/VisitFace/DemoForBsk/app/src/main/cpp/CMakeLists.txt +++ b/VisitFace/DemoForBsk/app/src/main/cpp/CMakeLists.txt @@ -2,11 +2,11 @@ cmake_policy(SET CMP0015 NEW) -INCLUDE_DIRECTORIES( "D:/workspace2/OpenCV-android-sdk/sdk/native/jni/include" ) +#INCLUDE_DIRECTORIES( "D:/workspace2/OpenCV-android-sdk/sdk/native/jni/include" ) -link_directories("D:/workspace2/OpenCV-android-sdk/sdk/native/libs/armeabi-v7a") +#link_directories("D:/workspace2/OpenCV-android-sdk/sdk/native/libs/armeabi-v7a") -include("D:/workspace2/OpenCV-android-sdk/sdk/native/jni/abi-armeabi-v7a/OpenCVModules.cmake") +#include("D:/workspace2/OpenCV-android-sdk/sdk/native/jni/abi-armeabi-v7a/OpenCVModules.cmake") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -UNDEBUG") -- Gitblit v1.8.0