mirror of
https://github.com/opencv/opencv.git
synced 2025-01-18 06:03:15 +08:00
Android port is updated for NDK r6b
This commit is contained in:
parent
1f0035d2af
commit
d4c094745f
@ -16,13 +16,13 @@
|
||||
# You need native port of make to build your project.
|
||||
# For example this one: http://gnuwin32.sourceforge.net/packages/make.htm
|
||||
#
|
||||
# $ SET ANDROID_NDK=C:\<absolute path to NDK>\android-ndk-r6
|
||||
# $ SET ANDROID_NDK=C:\<absolute path to NDK>\android-ndk-r6b
|
||||
# $ cmake.exe -G"Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=<path to this file>\android.toolchain.cmake -DCMAKE_MAKE_PROGRAM=C:\<absolute path to make>\make.exe ..
|
||||
# $ C:\<absolute path to make>\make.exe
|
||||
#
|
||||
#
|
||||
# Toolchain options (can be set as cmake parameters: -D<option_name>=<value>):
|
||||
# ANDROID_NDK=/opt/android-ndk-r6 - path to NDK root.
|
||||
# ANDROID_NDK=/opt/android-ndk-r6b - path to NDK root.
|
||||
# Can be set as environment variable.
|
||||
#
|
||||
# ANDROID_NDK_TOOLCHAIN_ROOT=/opt/android-toolchain - path to standalone toolchain.
|
||||
@ -99,6 +99,8 @@
|
||||
# [~] fixed options caching
|
||||
# [~] search for all supported NDK versions
|
||||
# [~] allowed spaces in NDK path
|
||||
# - modified September 2011 Andrey Kamaev andrey.kamaev@itseez.com
|
||||
# [~] updated for NDK r6b
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
# this one is important
|
||||
@ -107,7 +109,7 @@ set( CMAKE_SYSTEM_NAME Linux )
|
||||
set( CMAKE_SYSTEM_VERSION 1 )
|
||||
|
||||
set( ANDROID_NDK_DEFAULT_SEARCH_PATH /opt/android-ndk )
|
||||
set( ANDROID_NDK_SUPPORTED_VERSIONS -r6 -r5c -r5b -r5 "")
|
||||
set( ANDROID_NDK_SUPPORTED_VERSIONS -r6b -r6 -r5c -r5b -r5 "")
|
||||
set( ANDROID_NDK_TOOLCHAIN_DEFAULT_SEARCH_PATH /opt/android-toolchain )
|
||||
set( TOOL_OS_SUFFIX "" )
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
:: variables required for OpenCV build ::
|
||||
:: Note: all pathes should be specified without tailing slashes!
|
||||
SET ANDROID_NDK=C:\full\path\to\your\copy\of\android\NDK\android-ndk-r6
|
||||
SET ANDROID_NDK=C:\full\path\to\your\copy\of\android\NDK\android-ndk-r6b
|
||||
SET CMAKE_EXE=C:\full\path\to\cmake\utility\cmake.exe
|
||||
SET MAKE_EXE=C:\full\path\to\native\port\of\make\utility\make.exe
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user