[sikuli] 71/385: finally swathed to using the new OpenCV static lib libopencv_java247.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 c31f80dd9d87f36bf42e0a3e884452a7adfd3b84
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Sun Dec 29 13:48:14 2013 +0100

    finally swathed to using the new OpenCV static lib libopencv_java247.dylib
---
 Libs/build/mac/runBuildNatives.sh     | 21 ++++++---------------
 Libs/build/mac/runBuildVisionProxy.sh |  4 ----
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/Libs/build/mac/runBuildNatives.sh b/Libs/build/mac/runBuildNatives.sh
index c257b0a..2db5a34 100644
--- a/Libs/build/mac/runBuildNatives.sh
+++ b/Libs/build/mac/runBuildNatives.sh
@@ -9,32 +9,23 @@ export DEVNATIVE=../../../Natives/src/main/native
 export DEVLIBS=../../src/main/resources/META-INF/libs/mac/libs$1
 
 echo ----- create JNI header for MacUtil
-#. runJNISetupForMacUtil.sh
+. runJNISetupForMacUtil.sh
 
 echo ----- build libMacUtil.dylib
-#. runBuildMacUtil.sh
+. runBuildMacUtil.sh
 
 echo ----- create JNI header for MacHotkeyManager
 #. runJNISetupForMacHotkeyManager.sh
 
 echo -----  build libMacHotkeyManager.dylib 
-#. runBuildMacHotkeyManager.sh
+. runBuildMacHotkeyManager.sh
 
 echo -----  use SWIG to create Java interface sources and native wrapper for VisionProxy
-#. runSwigForVision.sh
+. runSwigForVision.sh
 
 echo -----  build libVisionProxy.dylib 
 . runBuildVisionProxy.sh
 
 echo -----  switch external refs to point to @loader_path/
-# so the dependencies are loaded fom same folder as the Sikuli libs
-# not needed currently ./changeForAllToLoaderPath.sh $DEVLIBS libMacUtil.dylib
-#. changeForAllToLoaderPath.sh $DEVLIBS libMacHotkeyManager.dylib
-#cd $OLDPWD
-#. changeForAllToLoaderPath.sh $DEVLIBS libVisionProxy.dylib
-#cd $OLDPWD
-
-echo -----  change the external refs for OpenCV libs to major version string for @loader_path to work
-# this is a hack, that has to be checked for necessary changes 
-#. changeForVisionToLoaderPathSpecial.sh $DEVLIBS 2.4.6 2.4
-#cd $OLDPWD
\ No newline at end of file
+. changeForAllToLoaderPath.sh $DEVLIBS libVisionProxy.dylib
+cd $OLDPWD
diff --git a/Libs/build/mac/runBuildVisionProxy.sh b/Libs/build/mac/runBuildVisionProxy.sh
index d5ef243..4cc5462 100644
--- a/Libs/build/mac/runBuildVisionProxy.sh
+++ b/Libs/build/mac/runBuildVisionProxy.sh
@@ -19,9 +19,6 @@ 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
 lnkCVall=$DEVLIBS/libopencv_java247.dylib
 
 # the compile steps
@@ -47,5 +44,4 @@ 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 $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