projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8ab16f6
)
Fixed camera libs setting in Android.mk
author
Andrey Kamaev
<no@email>
Mon, 25 Jul 2011 11:18:48 +0000
(11:18 +0000)
committer
Andrey Kamaev
<no@email>
Mon, 25 Jul 2011 11:18:48 +0000
(11:18 +0000)
OpenCV.mk.in
patch
|
blob
|
history
diff --git
a/OpenCV.mk.in
b/OpenCV.mk.in
index
275b8e5
..
e9c8ccf
100644
(file)
--- a/
OpenCV.mk.in
+++ b/
OpenCV.mk.in
@@
-14,11
+14,7
@@
OPENCV_MODULES := contrib calib3d objdetect features2d imgproc video highgui ml
ifeq (${OPENCV_CAMERA_MODULES},off)
OPENCV_CAMERA_MODULES:=
else
- ifeq ($(TARGET_ARCH_ABI),armeabi)
- OPENCV_CAMERA_MODULES:=
- else
- OPENCV_CAMERA_MODULES:=@CMAKE_CAMERA_LIBS_CONFIGCMAKE@
- endif
+ OPENCV_CAMERA_MODULES:=@CMAKE_CAMERA_LIBS_CONFIGCMAKE@
endif
OPENCV_LIB_TYPE:=@OPENCV_LIBTYPE_CONFIGMAKE@