woops, broke cmake for a bit...

diff --git a/android/README.android.txt b/android/README.android.txt
index 0e96e96..c4d54ab 100644 (file)
--- a/android/README.android.txt
+++ b/android/README.android.txt
@@ -32,4 +32,7 @@ LOCAL_LDLIBS += $(OPENCV_LIBS)
     
 LOCAL_C_INCLUDES +=  $(OPENCV_INCLUDES)
 
+for now, you also need to cd to android-jni and run make
+this will create the android shared library with some useful functionality
+that may be reused in android projects.
 

diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt
index 8837782..38c46a1 100644 (file)
--- a/modules/highgui/CMakeLists.txt
+++ b/modules/highgui/CMakeLists.txt
@@ -3,7 +3,7 @@
 #   Some parts taken from version of Hartmut Seichter, HIT Lab NZ.
 #   Jose Luis Blanco, 2008
 # ----------------------------------------------------------------------------
-if(!ANDROID)
+if(NOT ANDROID)
 project(opencv_highgui)
 
 if(WITH_JPEG)
@@ -334,7 +334,9 @@ install(FILES ${highgui_ext_hdrs}
         DESTINATION include/opencv2/highgui
         COMPONENT main)
         
-else(!ANDROID)
+endif()
+
+if(ANDROID)
 set(high_gui_android_srcs src/bitstrm.cpp
     src/cap.cpp 
     src/grfmt_base.cpp 
@@ -350,4 +352,4 @@ set(high_gui_android_srcs src/bitstrm.cpp
     src/grfmt_pxm.cpp 
     src/window.cpp )
 define_android_manual(highgui "${high_gui_android_srcs}" "$(LOCAL_PATH)/src  $(OPENCV_INCLUDES)")      
-endif(!ANDROID)
+endif()