Merged the trunk r8547:8574, r8587

2012-06-15 08:36:35 +00:00
parent 4b1724aeb9
commit ab20da0f53
12 changed files with 133 additions and 33 deletions
--- a/samples/android/tutorial-4-mixed/jni/Android.mk
+++ b/samples/android/tutorial-4-mixed/jni/Android.mk
@@ -3,6 +3,8 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)

 OPENCV_CAMERA_MODULES:=off
+OPENCV_INSTALL_MODULES:=on
+#OPENCV_LIB_TYPE:=SHARED <- this is default

 include ../includeOpenCV.mk
 ifeq ("$(wildcard $(OPENCV_MK_PATH))","")