[sikuli] 62/385: on Mac: for the OpenCV dependent libs we now use the all containing static library libopencv_javaXXX.dylib

[Gilles Filippini]

This is an automated email from the git hooks/post-receive script.

pini pushed a commit to tag upstream/1.1.0_beta1
in repository sikuli.

commit 3f58dc0bcb71851e83d62f8fcb7423f9b6f0d6eb
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Sun Dec 29 12:52:55 2013 +0100

    on Mac: for the OpenCV dependent libs we now use the all containing static library libopencv_javaXXX.dylib
---
 Libs/build/mac/runBuildVisionProxy.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Libs/build/mac/runBuildVisionProxy.sh b/Libs/build/mac/runBuildVisionProxy.sh
index c5ef8e2..d5ef243 100644
--- a/Libs/build/mac/runBuildVisionProxy.sh
+++ b/Libs/build/mac/runBuildVisionProxy.sh
@@ -19,9 +19,10 @@ ijava=/System/Library/Frameworks/JavaVM.framework/Headers
 
 # modules the linker should know (have to be checked/adapted on your system)
 lnkTess=$DEVLIBS/libtesseract.3.dylib 
-lnkCVcore=$DEVLIBS/libopencv_core.2.4.dylib 
-lnkCVhighgui=$DEVLIBS/libopencv_highgui.2.4.dylib 
-lnkCVimgproc=$DEVLIBS/libopencv_imgproc.2.4.dylib 
+#lnkCVcore=$DEVLIBS/libopencv_core.2.4.dylib 
+#lnkCVhighgui=$DEVLIBS/libopencv_highgui.2.4.dylib 
+#lnkCVimgproc=$DEVLIBS/libopencv_imgproc.2.4.dylib
+lnkCVall=$DEVLIBS/libopencv_java247.dylib
 
 # the compile steps
 echo -- cvgui
@@ -46,4 +47,5 @@ echo -- visionJAVA_wrap
 g++ -c -O3 -I$iany -I$icv -I$itess -I$ijava -fPIC  -MMD -MP -MF $externals/visionJAVA_wrap.o.d -o $externals/visionJAVA_wrap.o $src/Vision/visionJAVA_wrap.cxx
 
 echo -- finally linking
-g++ -o $DEVLIBS/$mod $externals/cvgui.o $externals/finder.o $externals/pyramid-template-matcher.o $externals/sikuli-debug.o $externals/tessocr.o $externals/vision.o $externals/visionJAVA_wrap.o $lnkTess $lnkCVcore $lnkCVhighgui $lnkCVimgproc -dynamic -dynamiclib -install_name $mod -Wl,-S -fPIC 
+#g++ -o $DEVLIBS/$mod $externals/cvgui.o $externals/finder.o $externals/pyramid-template-matcher.o $externals/sikuli-debug.o $externals/tessocr.o $externals/vision.o $externals/visionJAVA_wrap.o $lnkTess $lnkCVcore $lnkCVhighgui $lnkCVimgproc -dynamic -dynamiclib -install_name $mod -Wl,-S -fPIC 
+g++ -o $DEVLIBS/$mod $externals/cvgui.o $externals/finder.o $externals/pyramid-template-matcher.o $externals/sikuli-debug.o $externals/tessocr.o $externals/vision.o $externals/visionJAVA_wrap.o $lnkTess $lnkCVall -dynamic -dynamiclib -install_name $mod -Wl,-S -fPIC 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git