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:
593fae4
)
Linking order for android.
author
Ethan Rublee
<no@email>
Thu, 10 Feb 2011 18:59:13 +0000
(18:59 +0000)
committer
Ethan Rublee
<no@email>
Thu, 10 Feb 2011 18:59:13 +0000
(18:59 +0000)
android/android-opencv.mk.in
patch
|
blob
|
history
diff --git
a/android/android-opencv.mk.in
b/android/android-opencv.mk.in
index
24f5228
..
5d5d446
100644
(file)
--- a/
android/android-opencv.mk.in
+++ b/
android/android-opencv.mk.in
@@
-34,5
+34,5
@@
ANDROID_OPENCV_LIB_DIRS := -L$(OPENCV_ROOT)/android/android-jni/libs/armeabi-v7a
OPENCV_LIBS := $(OPENCV_LIB_DIRS) -lopencv_calib3d -lopencv_features2d -lopencv_objdetect -lopencv_imgproc \
-lopencv_video -lopencv_highgui -lopencv_ml -lopencv_legacy -lopencv_core -lopencv_lapack -lopencv_flann \
-lzlib -lpng -ljpeg -ljasper
-ANDROID_OPENCV_LIBS :=
$(ANDROID_OPENCV_LIB_DIRS) -landroid-opencv
+ANDROID_OPENCV_LIBS :=
-landroid-opencv $(ANDROID_OPENCV_LIB_DIRS)