generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

woops, broke cmake for a bit...

Browse Source
This commit is contained in:
Ethan Rublee 2010-09-22 03:36:45 +00:00
parent 60357e256b
commit 2f3f677ffe
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
android/README.android.txt
View File

@ -32,4 +32,7 @@ LOCAL_LDLIBS += $(OPENCV_LIBS)
LOCAL_C_INCLUDES += $(OPENCV_INCLUDES) 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.

8
modules/highgui/CMakeLists.txt
View File

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