generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Small Android build fixes

Browse Source
This commit is contained in:
Andrey Kamaev 2011-05-13 18:32:05 +00:00
parent 56cf08a873
commit 9d787afe72
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -479,7 +479,7 @@ if(UNIX)
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" AND NOT ANDROID) if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" AND NOT ANDROID)
set(OPENCV_LINKER_LIBS m pthread) set(OPENCV_LINKER_LIBS m pthread)
elseif(ANDROID) elseif(ANDROID)
set(OPENCV_LINKER_LIBS dl m) set(OPENCV_LINKER_LIBS dl m log)
else() else()
set(OPENCV_LINKER_LIBS dl m pthread rt) set(OPENCV_LINKER_LIBS dl m pthread rt)
endif() endif()
@ -510,10 +510,10 @@ if (ANDROID)
FIND_PACKAGE(NativeCamera QUIET) FIND_PACKAGE(NativeCamera QUIET)
if(NativeCamera_FOUND) if(NativeCamera_FOUND)
set(HAVE_ANDROID_NATIVE_CAMERA TRUE) set(HAVE_ANDROID_NATIVE_CAMERA TRUE)
set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${NativeCamera_LIBS} log) set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${NativeCamera_LIBS})
else() else()
set(HAVE_ANDROID_NATIVE_CAMERA FALSE) set(HAVE_ANDROID_NATIVE_CAMERA FALSE)
message("-- Could NOT find NativeCamera for Android") message(STATUS "Could NOT find NativeCamera for Android")
endif() endif()
endif() endif()

2
android/scripts/wincfg.cmd.tmpl
View File

@ -19,7 +19,7 @@ SET BUILD_DIR=build
::SET BUILD_DIR=build_armeabi ::SET BUILD_DIR=build_armeabi
:::: uncomment following lines to compile for ARM-V7 with NEON support :::: uncomment following lines to compile for ARM-V7 with NEON support
::SET ARM_TARGET="armeabi-v7a with NEON" ::SET ARM_TARGET=armeabi-v7a with NEON
::SET BUILD_DIR=build_neon ::SET BUILD_DIR=build_neon
:::: other options :::: other options