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

fixing a bug in the local.env.mk setup, and correcting the readme's

Browse Source 
Also, the androi-opencv.mk.in wasn't correct for one of the crystax NDK
build directory setups
This commit is contained in:
Ethan Rublee
2010-09-22 13:24:37 +00:00
parent d72d11d09d
commit 96e127134d
4 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
android/android-opencv.mk.in
View File

@@ -14,14 +14,21 @@ ifndef OPENCV_BUILD_ROOT
OPENCV_BUILD_ROOT := ${CMAKE_BINARY_DIR}
endif
OPENCV_INCLUDES := ${android_module_include_dirs} $(OPENCV_ROOT)/android/android-jni/jni
OPENCV_INCLUDES := ${android_module_include_dirs}
ANDROID_OPENCV_INCLUDES := $(OPENCV_ROOT)/android/android-jni/jni
ARMOBJS := obj/local/armeabi
ARMOBJS_V7A := obj/local/armeabi-v7a
OPENCV_LIB_DIRS := -L$(OPENCV_BUILD_ROOT)/$(ARMOBJS_V7A) -L$(OPENCV_BUILD_ROOT)/$(ARMOBJS)
ARMOBJS := local/armeabi
ARMOBJS_V7A := local/armeabi-v7a
ANDROID_OPENCV_LIB_DIRS := -L$(OPENCV_ROOT)/android/android-jni/$(ARMOBJS_V7A) -L$(OPENCV_ROOT)/android/android-jni/$(ARMOBJS)
OPENCV_LIB_DIRS := -L$(OPENCV_BUILD_ROOT)/obj/$(ARMOBJS_V7A) \
-L$(OPENCV_BUILD_ROOT)/obj/$(ARMOBJS) -L$(OPENCV_BUILD_ROOT)/bin/ndk/$(ARMOBJS) \
-L$(OPENCV_BUILD_ROOT)/bin/ndk/$(ARMOBJS_V7A)
ANDROID_OPENCV_LIB_DIRS := -L$(OPENCV_ROOT)/android/android-jni/obj/$(ARMOBJS_V7A) \
-L$(OPENCV_ROOT)/android/android-jni/obj/$(ARMOBJS) \
-L$(OPENCV_ROOT)/android/android-jni/bin/ndk/$(ARMOBJS_V7A) \
-L$(OPENCV_ROOT)/android/android-jni/bin/ndk/$(ARMOBJS)
#order of linking very important ---- may have stuff out of order here, but
#important that modules that are more dependent come first...