mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-25 22:57:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7174 from guycook:android-libcpp

Browse Source
This commit is contained in:
Maksim Shabunin 2016-09-02 09:54:52 +00:00
commit 1ac1e5be08
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
3rdparty/carotene/src/common.hpp vendored
View File

@ -41,6 +41,7 @@
#define CAROTENE_SRC_COMMON_HPP #define CAROTENE_SRC_COMMON_HPP
#include <cstddef> #include <cstddef>
#include <cstdlib>
#include <algorithm> #include <algorithm>
#if defined WITH_NEON && (defined __ARM_NEON__ || defined __ARM_NEON) #if defined WITH_NEON && (defined __ARM_NEON__ || defined __ARM_NEON)

3
platforms/android/android.toolchain.cmake
View File

@ -1048,8 +1048,7 @@ if( BUILD_WITH_ANDROID_NDK )
set( ANDROID_RTTI ON ) set( ANDROID_RTTI ON )
set( __libstl "${ANDROID_NDK}/sources/cxx-stl/llvm-libc++" ) set( __libstl "${ANDROID_NDK}/sources/cxx-stl/llvm-libc++" )
set( __libstl "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/libc++_static.a" ) set( __libstl "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/libc++_static.a" )
set( __libgnustl "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_COMPILER_VERSION}" ) set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/android/support/include" "${ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libcxx/include" "${ANDROID_NDK}/sources/cxx-stl/llvm-libc++abi/libcxxabi/include" )
set( ANDROID_STL_INCLUDE_DIRS "${__libgnustl}/include" "${__libgnustl}/libs/${ANDROID_NDK_ABI_NAME}/include" "${__libgnustl}/include/backward" )
else() else()
message( FATAL_ERROR "Unknown runtime: ${ANDROID_STL}" ) message( FATAL_ERROR "Unknown runtime: ${ANDROID_STL}" )
endif() endif()