projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d6b6734
)
Fixed native camera support in Android.mk
author
Andrey Kamaev
<no@email>
Wed, 29 Jun 2011 13:18:20 +0000
(13:18 +0000)
committer
Andrey Kamaev
<no@email>
Wed, 29 Jun 2011 13:18:20 +0000
(13:18 +0000)
OpenCV.mk.in
patch
|
blob
|
history
diff --git
a/OpenCV.mk.in
b/OpenCV.mk.in
index
5c1b2ef
..
a307552
100644
(file)
--- a/
OpenCV.mk.in
+++ b/
OpenCV.mk.in
@@
-14,8
+14,12
@@
OPENCV_MODULES := contrib calib3d objdetect features2d imgproc video highgui ml
ifeq ($(TARGET_ARCH_ABI),armeabi)
OPENCV_CAMERA_MODULES:=
else
+ifeq (${OPENCV_CAMERA_MODULES},off)
+OPENCV_CAMERA_MODULES:=
+else
OPENCV_CAMERA_MODULES:=@CMAKE_CAMERA_LIBS_CONFIGCMAKE@
endif
+endif
OPENCV_LIB_TYPE:=@OPENCV_LIBTYPE_CONFIGMAKE@