Skip to content

O
opencv
Commit 9bbb0ed0 authored by Andrey Kamaev's avatar Andrey Kamaev Committed by OpenCV Buildbot
Browse files
Options

Merge pull request #531 from asmorkalov:android_mips_fix

parents 051aa4cb 4bbdfbc9
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
cmake/OpenCVGenAndroidMK.cmake
View file @ 9bbb0ed0
...@@ -20,7 +20,7 @@ if(ANDROID) ...@@ -20,7 +20,7 @@ if(ANDROID)
endif() endif()
# setup lists of camera libs # setup lists of camera libs
foreach(abi ARMEABI ARMEABI_V7A X86) foreach(abi ARMEABI ARMEABI_V7A X86 MIPS)
ANDROID_GET_ABI_RAWNAME(${abi} ndkabi) ANDROID_GET_ABI_RAWNAME(${abi} ndkabi)
if(BUILD_ANDROID_CAMERA_WRAPPER) if(BUILD_ANDROID_CAMERA_WRAPPER)
if(ndkabi STREQUAL ANDROID_NDK_ABI_NAME) if(ndkabi STREQUAL ANDROID_NDK_ABI_NAME)
......
cmake/templates/OpenCV.mk.in
View file @ 9bbb0ed0
...@@ -57,6 +57,9 @@ ifeq (${OPENCV_CAMERA_MODULES},on) ...@@ -57,6 +57,9 @@ ifeq (${OPENCV_CAMERA_MODULES},on)
ifeq ($(TARGET_ARCH_ABI),x86) ifeq ($(TARGET_ARCH_ABI),x86)
OPENCV_CAMERA_MODULES:=@OPENCV_CAMERA_LIBS_X86_CONFIGCMAKE@ OPENCV_CAMERA_MODULES:=@OPENCV_CAMERA_LIBS_X86_CONFIGCMAKE@
endif endif
ifeq ($(TARGET_ARCH_ABI),mips)
OPENCV_CAMERA_MODULES:=@OPENCV_CAMERA_LIBS_MIPS_CONFIGCMAKE@
endif
else else
OPENCV_CAMERA_MODULES:= OPENCV_CAMERA_MODULES:=
endif endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment