[sikuli] 330/385: now the native stuff can be built on a Windows 64-Bit system (using Windows 8.1) for 64-Bit and 32-Bit based on Tesseract 3.0.2 and OpenCV 2.4.8- the global receipt is in SikuliX-2014\Libs\build\windows\TheBuildProcess\00_natives_build.txt

Gilles Filippini pini at moszumanska.debian.org
Sun Jun 29 19:26:32 UTC 2014


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 88dc7c51cff0061b1df4390b07951e0f6e24fb7a
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Tue Mar 25 17:47:28 2014 +0100

    now the native stuff can be built on a Windows 64-Bit system (using Windows 8.1) for 64-Bit and 32-Bit based on Tesseract 3.0.2 and OpenCV 2.4.8- the global receipt is in SikuliX-2014\Libs\build\windows\TheBuildProcess\00_natives_build.txt
---
 .../windows/TheBuildProcess/00_natives_build.txt   |  22 ++++++-
 .../jpegsrc.v9.tar.gz                              | Bin
 .../leptonica-1.69.tar.gz                          | Bin
 .../libpng-1.5.14.tar.bz2                          | Bin
 .../tesseract-ocr-3.02.02.tar.gz                   | Bin
 .../tiff-4.0.3.tar.gz                              | Bin
 .../zlib-1.2.7.tar.bz2                             | Bin
 .../TheBuildProcess/{07_cmake => 08_cmake}/mymake  |   0
 .../{07_opencv => 09_opencv}/cmake_opencv_base     |   0
 .../{07_opencv => 09_opencv}/cmake_opencv_base.py  |   0
 .../{07_opencv => 09_opencv}/cmake_opencv_base.txt |   2 +-
 .../{07_opencv => 09_opencv}/mymake                |   2 +-
 .../windows/TheBuildProcess/10_WinUtil/mymake      |  44 +++++++++++++
 .../build/windows/TheBuildProcess/11_Vision/mymake |  71 +++++++++++++++++++++
 .../libs/windows/libs32/1.1-MadeForSikuliX32W.txt  |   1 -
 .../META-INF/libs/windows/libs32/JIntellitype.dll  | Bin 30208 -> 0 bytes
 .../META-INF/libs/windows/libs32/VisionProxy.dll   | Bin 369678 -> 0 bytes
 .../META-INF/libs/windows/libs32/WinUtil.dll       | Bin 15872 -> 20992 bytes
 .../libs/windows/libs32/libgcc_s_dw2-1.dll         | Bin 119296 -> 116750 bytes
 .../META-INF/libs/windows/libs32/libjpeg-9.dll     | Bin 339001 -> 330293 bytes
 .../META-INF/libs/windows/libs32/liblept-2.dll     | Bin 1904753 -> 0 bytes
 .../libs/windows/libs32/libopencv_core244.dll      | Bin 3026339 -> 0 bytes
 .../libs/windows/libs32/libopencv_highgui244.dll   | Bin 506119 -> 0 bytes
 .../libs/windows/libs32/libopencv_imgproc244.dll   | Bin 2802194 -> 0 bytes
 .../META-INF/libs/windows/libs32/libpng15-15.dll   | Bin 258898 -> 290698 bytes
 .../META-INF/libs/windows/libs32/libstdc++-6.dll   | Bin 1024014 -> 969742 bytes
 .../libs/windows/libs32/libtesseract-3.dll         | Bin 2682894 -> 2736506 bytes
 .../META-INF/libs/windows/libs32/zlib1.dll         | Bin 93696 -> 0 bytes
 .../libs/windows/libs64/1.1-MadeForSikuliX64W.txt  |   1 -
 .../META-INF/libs/windows/libs64/JIntellitype.dll  | Bin 468704 -> 0 bytes
 .../META-INF/libs/windows/libs64/VisionProxy.dll   | Bin 7482728 -> 472064 bytes
 .../META-INF/libs/windows/libs64/WinUtil.dll       | Bin 6554218 -> 20480 bytes
 .../libs/windows/libs64/libgcc_s_sjlj_64-1.dll     | Bin 103936 -> 0 bytes
 .../META-INF/libs/windows/libs64/libjpeg-9.dll     | Bin 347631 -> 379799 bytes
 .../META-INF/libs/windows/libs64/liblept-2.dll     | Bin 1721659 -> 0 bytes
 .../libs/windows/libs64/libopencv_core244.dll      | Bin 2921984 -> 0 bytes
 .../libs/windows/libs64/libopencv_highgui244.dll   | Bin 2004992 -> 0 bytes
 .../libs/windows/libs64/libopencv_imgproc244.dll   | Bin 2546688 -> 0 bytes
 .../META-INF/libs/windows/libs64/libpng15-15.dll   | Bin 246747 -> 306470 bytes
 .../libs/windows/libs64/libstdc++_64-6.dll         | Bin 1038336 -> 0 bytes
 .../libs/windows/libs64/libtesseract-3.dll         | Bin 3034644 -> 3087305 bytes
 .../META-INF/libs/windows/libs64/zlib1.dll         | Bin 117248 -> 0 bytes
 42 files changed, 136 insertions(+), 7 deletions(-)

diff --git a/Libs/build/windows/TheBuildProcess/00_natives_build.txt b/Libs/build/windows/TheBuildProcess/00_natives_build.txt
index b4d930e..912c594 100644
--- a/Libs/build/windows/TheBuildProcess/00_natives_build.txt
+++ b/Libs/build/windows/TheBuildProcess/00_natives_build.txt
@@ -25,22 +25,37 @@ mingw(64)
 
 --- in msys32.bat to automate this
 if exist c:\mingw64 goto IS32MG
+	
 	rename c:\mingw mingw64
+	
 	rename c:\mingw32 mingw
 :IS32MG
+
 if exist c:\msys\local64 goto IS32
+
 	rename c:\msys\local local64
+	
 	rename c:\msys\local32 local
+
 :IS32
+
 if not exist c:\mingw64 goto ERROR32
+
 if exist c:\msys\local64 goto IS32OK
+
 :ERROR32
+
 dir c:\m*
+
 dir c:\msys\l*
+
 pause
+
 goto EOF
+
 :IS32OK
 
+
 --- in msys64.bat to automate this
 if exist c:\mingw32 goto IS64MG
 	rename c:\mingw mingw32
@@ -81,8 +96,8 @@ lib -> /usr/local/lib
 
 *** zlib (zlib1.dll)
 current zlib-1.2.7 (.tar.bz2)
-m/ymake
-+
+mymake
+
 *** libpng (libpng15-15.dll)
 current: libpng-1.5.14 (.tar.gz)
 mymake
@@ -108,8 +123,9 @@ current: tesseract-ocr-3.02.02 (.tar.gz)
 mymake
 changed files?
 
-*** opencv (libopencv_java248.dll, opencv-248.jar)
+*** opencv (libopencv_xxx248.dll, opencv-248.jar)
 current: opencv-2.4.8 (.zip) (download from web: http://opencv.org/downloads.html - Linux/Mac)
+needs JAVA_HOME set to the correct JDK
 mymake (contains special cmake parameter setup) 
 selects: core feature2d flann highgui imgproc java  
 resulting stuff in buildXX/bin
\ No newline at end of file
diff --git a/Libs/build/windows/TheBuildProcess/00_natives_packages/jpegsrc.v9.tar.gz b/Libs/build/windows/TheBuildProcess/00_natives_packages_01-06/jpegsrc.v9.tar.gz
similarity index 100%
rename from Libs/build/windows/TheBuildProcess/00_natives_packages/jpegsrc.v9.tar.gz
rename to Libs/build/windows/TheBuildProcess/00_natives_packages_01-06/jpegsrc.v9.tar.gz
diff --git a/Libs/build/windows/TheBuildProcess/00_natives_packages/leptonica-1.69.tar.gz b/Libs/build/windows/TheBuildProcess/00_natives_packages_01-06/leptonica-1.69.tar.gz
similarity index 100%
rename from Libs/build/windows/TheBuildProcess/00_natives_packages/leptonica-1.69.tar.gz
rename to Libs/build/windows/TheBuildProcess/00_natives_packages_01-06/leptonica-1.69.tar.gz
diff --git a/Libs/build/windows/TheBuildProcess/00_natives_packages/libpng-1.5.14.tar.bz2 b/Libs/build/windows/TheBuildProcess/00_natives_packages_01-06/libpng-1.5.14.tar.bz2
similarity index 100%
rename from Libs/build/windows/TheBuildProcess/00_natives_packages/libpng-1.5.14.tar.bz2
rename to Libs/build/windows/TheBuildProcess/00_natives_packages_01-06/libpng-1.5.14.tar.bz2
diff --git a/Libs/build/windows/TheBuildProcess/00_natives_packages/tesseract-ocr-3.02.02.tar.gz b/Libs/build/windows/TheBuildProcess/00_natives_packages_01-06/tesseract-ocr-3.02.02.tar.gz
similarity index 100%
rename from Libs/build/windows/TheBuildProcess/00_natives_packages/tesseract-ocr-3.02.02.tar.gz
rename to Libs/build/windows/TheBuildProcess/00_natives_packages_01-06/tesseract-ocr-3.02.02.tar.gz
diff --git a/Libs/build/windows/TheBuildProcess/00_natives_packages/tiff-4.0.3.tar.gz b/Libs/build/windows/TheBuildProcess/00_natives_packages_01-06/tiff-4.0.3.tar.gz
similarity index 100%
rename from Libs/build/windows/TheBuildProcess/00_natives_packages/tiff-4.0.3.tar.gz
rename to Libs/build/windows/TheBuildProcess/00_natives_packages_01-06/tiff-4.0.3.tar.gz
diff --git a/Libs/build/windows/TheBuildProcess/00_natives_packages/zlib-1.2.7.tar.bz2 b/Libs/build/windows/TheBuildProcess/00_natives_packages_01-06/zlib-1.2.7.tar.bz2
similarity index 100%
rename from Libs/build/windows/TheBuildProcess/00_natives_packages/zlib-1.2.7.tar.bz2
rename to Libs/build/windows/TheBuildProcess/00_natives_packages_01-06/zlib-1.2.7.tar.bz2
diff --git a/Libs/build/windows/TheBuildProcess/07_cmake/mymake b/Libs/build/windows/TheBuildProcess/08_cmake/mymake
similarity index 100%
rename from Libs/build/windows/TheBuildProcess/07_cmake/mymake
rename to Libs/build/windows/TheBuildProcess/08_cmake/mymake
diff --git a/Libs/build/windows/TheBuildProcess/07_opencv/cmake_opencv_base b/Libs/build/windows/TheBuildProcess/09_opencv/cmake_opencv_base
similarity index 100%
rename from Libs/build/windows/TheBuildProcess/07_opencv/cmake_opencv_base
rename to Libs/build/windows/TheBuildProcess/09_opencv/cmake_opencv_base
diff --git a/Libs/build/windows/TheBuildProcess/07_opencv/cmake_opencv_base.py b/Libs/build/windows/TheBuildProcess/09_opencv/cmake_opencv_base.py
similarity index 100%
rename from Libs/build/windows/TheBuildProcess/07_opencv/cmake_opencv_base.py
rename to Libs/build/windows/TheBuildProcess/09_opencv/cmake_opencv_base.py
diff --git a/Libs/build/windows/TheBuildProcess/07_opencv/cmake_opencv_base.txt b/Libs/build/windows/TheBuildProcess/09_opencv/cmake_opencv_base.txt
similarity index 99%
rename from Libs/build/windows/TheBuildProcess/07_opencv/cmake_opencv_base.txt
rename to Libs/build/windows/TheBuildProcess/09_opencv/cmake_opencv_base.txt
index b5f266e..59db970 100644
--- a/Libs/build/windows/TheBuildProcess/07_opencv/cmake_opencv_base.txt
+++ b/Libs/build/windows/TheBuildProcess/09_opencv/cmake_opencv_base.txt
@@ -7,7 +7,7 @@ BUILD_OPENEXR:BOOL=OFF
 BUILD_PACKAGE:BOOL=OFF
 BUILD_PERF_TESTS:BOOL=OFF
 BUILD_PNG:BOOL=OFF
-BUILD_SHARED_LIBS:BOOL=OFF
+BUILD_SHARED_LIBS:BOOL=ON
 BUILD_TBB:BOOL=OFF
 BUILD_TESTS:BOOL=OFF
 BUILD_TIFF:BOOL=OFF
diff --git a/Libs/build/windows/TheBuildProcess/07_opencv/mymake b/Libs/build/windows/TheBuildProcess/09_opencv/mymake
similarity index 99%
rename from Libs/build/windows/TheBuildProcess/07_opencv/mymake
rename to Libs/build/windows/TheBuildProcess/09_opencv/mymake
index c35bed2..36b6d8b 100644
--- a/Libs/build/windows/TheBuildProcess/07_opencv/mymake
+++ b/Libs/build/windows/TheBuildProcess/09_opencv/mymake
@@ -22,7 +22,7 @@ cmake -G "MSYS Makefiles" \
 -DBUILD_PACKAGE="OFF" \
 -DBUILD_PERF_TESTS="OFF" \
 -DBUILD_PNG="OFF" \
--DBUILD_SHARED_LIBS="OFF" \
+-DBUILD_SHARED_LIBS="ON" \
 -DBUILD_TBB="OFF" \
 -DBUILD_TESTS="OFF" \
 -DBUILD_TIFF="OFF" \
diff --git a/Libs/build/windows/TheBuildProcess/10_WinUtil/mymake b/Libs/build/windows/TheBuildProcess/10_WinUtil/mymake
new file mode 100644
index 0000000..ab18f14
--- /dev/null
+++ b/Libs/build/windows/TheBuildProcess/10_WinUtil/mymake
@@ -0,0 +1,44 @@
+echo ------------ WinUtil --------------------------
+echo -----------------------------------------------
+g++ --version
+echo -----------------------------------------------
+
+SRC="/C/Users/RaiMan/Documents/GitHub/SikuliX-2014/Natives/src/main/native"
+MGRP="OSUtil/Windows"
+MOD=WinUtil
+J64="1.7.0_51"
+J32="1.7.0_45"
+
+rm -f -R build
+mkdir build
+
+if [ -e /usr/local32 ]; then
+	echo --- 64-Bit
+	rm -f -R libs64
+	mkdir libs64
+	JINC="/C/Program Files/Java/jdk$J64/include/win32"
+	JINCW32="/C/Program Files/Java/jdk$J64/include"
+	JAWT="/C/Program Files/Java/jdk$J64/jre/bin/jawt.dll"
+else
+	echo --- 32-Bit
+	rm -f -R libs32
+	mkdir libs32
+	JINC="/C/Program Files (x86)/Java/jdk$J32/include/win32"
+	JINCW32="/C/Program Files (x86)/Java/jdk$J32/include"
+fi
+
+g++ -c -O2 -s -I"$JINC" -I"$JINCW32" -MMD -MP -MF build/$MOD.o.d -o build/$MOD.o "$SRC/$MGRP/$MOD.cc" 
+
+if [  -e /usr/local32 ]; then
+	g++ -o libs64/$MOD.dll build/$MOD.o "$JAWT" -shared -s
+	ls -l libs64
+else
+	JAWT="/C/Program Files (x86)/Java/jdk$J32/lib"
+	DLLN=jawt
+	echo EXPORTS >build/$DLLN.def
+	echo _JAWT_GetAWT at 8 >>build/$DLLN.def
+	echo _imp__JAWT_GetAWT at 8 >>build/$DLLN.def
+	dlltool --def build/$DLLN.def -k --dllname $DLLN.dll --output-lib build/$DLLN.a
+	g++ -Wl,--kill-at -o libs32/$MOD.dll build/$MOD.o -L"$JAWT" build/$DLLN.a -shared -s
+	ls -l libs32
+fi 
diff --git a/Libs/build/windows/TheBuildProcess/11_Vision/mymake b/Libs/build/windows/TheBuildProcess/11_Vision/mymake
new file mode 100644
index 0000000..5d803f9
--- /dev/null
+++ b/Libs/build/windows/TheBuildProcess/11_Vision/mymake
@@ -0,0 +1,71 @@
+echo ------------ VisionProxy --------------------------
+echo -----------------------------------------------
+g++ --version
+echo -----------------------------------------------
+
+SRC="/C/Users/RaiMan/Documents/GitHub/SikuliX-2014/Natives/src/main/native"
+MGRP="Vision"
+MOD=VisionProxy
+OCV=248
+J64="1.7.0_51"
+J32="1.7.0_45"
+
+rm -f -R build
+mkdir build
+
+if [ -e /usr/local32 ]; then
+	echo --- 64-Bit
+	rm -f -R libs64
+	mkdir libs64
+	JINC="/C/Program Files/Java/jdk$J64/include"
+	JINC1="/C/Program Files/Java/jdk$J64/include/win32"
+	LIBS="/C/msys/src/SikuliXBuild/ZStuff/libs64"
+else
+	echo --- 32-Bit
+	rm -f -R libs32
+	mkdir libs32
+	JINC="/C/Program Files (x86)/Java/jdk$J32/include"
+	JINC1="/C/Program Files (x86)/Java/jdk$J32/include/win32"
+	LIBS="/C/msys/src/SikuliXBuild/ZStuff/libs32"
+fi
+
+includeParm="-I/usr/include -I/usr/local/include" 
+includeParm="$includeParm -I/src/opencv/modules/core/include -I/src/opencv/modules/highgui/include -I/src/opencv/modules/imgproc/include"
+includeParm="$includeParm -I/src/tesseract/api -I/src/tesseract/ccutil -I/src/tesseract/ccstruct -I/src/tesseract/ccmain"
+
+# the compile steps
+echo -- cvgui
+g++ -c -O3  -MMD -MP -MF build/cvgui.o.d $includeParm -o build/cvgui.o $SRC/$MGRP/cvgui.cpp
+
+echo -- finder
+g++ -c -O3  -MMD -MP -MF build/finder.o.d $includeParm -o build/finder.o $SRC/$MGRP/finder.cpp
+
+echo -- pyramid-template-matcher
+g++ -c -O3  -MMD -MP -MF build/pyramid-template-matcher.o.d $includeParm -o build/pyramid-template-matcher.o $SRC/$MGRP/pyramid-template-matcher.cpp
+
+echo -- sikuli-debug
+g++ -c -O3  -MMD -MP -MF build/sikuli-debug.o.d $includeParm -o build/sikuli-debug.o $SRC/$MGRP/sikuli-debug.cpp
+
+echo -- tessocr
+g++ -c -O3  -MMD -MP -MF build/tessocr.o.d $includeParm -o build/tessocr.o $SRC/$MGRP/tessocr.cpp
+
+echo -- vision
+g++ -c -O3  -MMD -MP -MF build/vision.o.d $includeParm -o build/vision.o $SRC/$MGRP/vision.cpp
+
+echo -- visionJAVA_wrap
+g++ -c -O3  -MMD -MP -MF build/visionJAVA_wrap.o.d -I"$JINC" -I"$JINC1" $includeParm -o build/visionJAVA_wrap.o $SRC/$MGRP/visionJAVA_wrap.cxx
+
+buildLibs="build/cvgui.o build/finder.o build/pyramid-template-matcher.o build/sikuli-debug.o build/tessocr.o build/vision.o build/visionJAVA_wrap.o"
+extLibs="$LIBS/libtesseract-3.dll "
+extLibs="$extLibs $LIBS/libopencv_core$OCV.dll" 
+extLibs="$extLibs $LIBS/libopencv_imgproc$OCV.dll" 
+extLibs="$extLibs $LIBS/libopencv_highgui$OCV.dll" 
+
+echo -- finally linking
+if [  -e /usr/local32 ]; then
+	g++  -shared -s  -dynamic -o libs64/$MOD.dll $buildLibs $extLibs >buildLink.txt 2>&1
+	ls -l libs64
+else
+	g++  -shared -s  -dynamic -o libs32/$MOD.dll $buildLibs $extLibs 
+	ls -l libs32
+fi 
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs32/1.1-MadeForSikuliX32W.txt b/Libs/src/main/resources/META-INF/libs/windows/libs32/1.1-MadeForSikuliX32W.txt
deleted file mode 100644
index 50b6501..0000000
--- a/Libs/src/main/resources/META-INF/libs/windows/libs32/1.1-MadeForSikuliX32W.txt
+++ /dev/null
@@ -1 +0,0 @@
-*** Do not delete this file ***
\ No newline at end of file
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs32/JIntellitype.dll b/Libs/src/main/resources/META-INF/libs/windows/libs32/JIntellitype.dll
deleted file mode 100644
index 839236b..0000000
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs32/JIntellitype.dll and /dev/null differ
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs32/VisionProxy.dll b/Libs/src/main/resources/META-INF/libs/windows/libs32/VisionProxy.dll
deleted file mode 100644
index a75417d..0000000
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs32/VisionProxy.dll and /dev/null differ
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs32/WinUtil.dll b/Libs/src/main/resources/META-INF/libs/windows/libs32/WinUtil.dll
index 3cdb8bb..a227008 100644
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs32/WinUtil.dll and b/Libs/src/main/resources/META-INF/libs/windows/libs32/WinUtil.dll differ
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs32/libgcc_s_dw2-1.dll b/Libs/src/main/resources/META-INF/libs/windows/libs32/libgcc_s_dw2-1.dll
index 90bd246..af41cf7 100644
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs32/libgcc_s_dw2-1.dll and b/Libs/src/main/resources/META-INF/libs/windows/libs32/libgcc_s_dw2-1.dll differ
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs32/libjpeg-9.dll b/Libs/src/main/resources/META-INF/libs/windows/libs32/libjpeg-9.dll
index f0a8dad..6f5c58b 100644
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs32/libjpeg-9.dll and b/Libs/src/main/resources/META-INF/libs/windows/libs32/libjpeg-9.dll differ
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs32/liblept-2.dll b/Libs/src/main/resources/META-INF/libs/windows/libs32/liblept-2.dll
deleted file mode 100644
index 39d680d..0000000
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs32/liblept-2.dll and /dev/null differ
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs32/libopencv_core244.dll b/Libs/src/main/resources/META-INF/libs/windows/libs32/libopencv_core244.dll
deleted file mode 100644
index 9e4ac31..0000000
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs32/libopencv_core244.dll and /dev/null differ
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs32/libopencv_highgui244.dll b/Libs/src/main/resources/META-INF/libs/windows/libs32/libopencv_highgui244.dll
deleted file mode 100644
index 46bb867..0000000
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs32/libopencv_highgui244.dll and /dev/null differ
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs32/libopencv_imgproc244.dll b/Libs/src/main/resources/META-INF/libs/windows/libs32/libopencv_imgproc244.dll
deleted file mode 100644
index 1c57b10..0000000
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs32/libopencv_imgproc244.dll and /dev/null differ
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs32/libpng15-15.dll b/Libs/src/main/resources/META-INF/libs/windows/libs32/libpng15-15.dll
index fa5bb89..7cbe08e 100644
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs32/libpng15-15.dll and b/Libs/src/main/resources/META-INF/libs/windows/libs32/libpng15-15.dll differ
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs32/libstdc++-6.dll b/Libs/src/main/resources/META-INF/libs/windows/libs32/libstdc++-6.dll
index cb1b0ae..73a58c5 100644
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs32/libstdc++-6.dll and b/Libs/src/main/resources/META-INF/libs/windows/libs32/libstdc++-6.dll differ
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs32/libtesseract-3.dll b/Libs/src/main/resources/META-INF/libs/windows/libs32/libtesseract-3.dll
index d0e75ba..0fb29b2 100644
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs32/libtesseract-3.dll and b/Libs/src/main/resources/META-INF/libs/windows/libs32/libtesseract-3.dll differ
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs32/zlib1.dll b/Libs/src/main/resources/META-INF/libs/windows/libs32/zlib1.dll
deleted file mode 100644
index 0d4854d..0000000
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs32/zlib1.dll and /dev/null differ
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs64/1.1-MadeForSikuliX64W.txt b/Libs/src/main/resources/META-INF/libs/windows/libs64/1.1-MadeForSikuliX64W.txt
deleted file mode 100644
index 50b6501..0000000
--- a/Libs/src/main/resources/META-INF/libs/windows/libs64/1.1-MadeForSikuliX64W.txt
+++ /dev/null
@@ -1 +0,0 @@
-*** Do not delete this file ***
\ No newline at end of file
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs64/JIntellitype.dll b/Libs/src/main/resources/META-INF/libs/windows/libs64/JIntellitype.dll
deleted file mode 100644
index 6dc2680..0000000
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs64/JIntellitype.dll and /dev/null differ
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs64/VisionProxy.dll b/Libs/src/main/resources/META-INF/libs/windows/libs64/VisionProxy.dll
index ffed3f2..d6d71a6 100644
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs64/VisionProxy.dll and b/Libs/src/main/resources/META-INF/libs/windows/libs64/VisionProxy.dll differ
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs64/WinUtil.dll b/Libs/src/main/resources/META-INF/libs/windows/libs64/WinUtil.dll
index f3bd765..dc395da 100644
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs64/WinUtil.dll and b/Libs/src/main/resources/META-INF/libs/windows/libs64/WinUtil.dll differ
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs64/libgcc_s_sjlj_64-1.dll b/Libs/src/main/resources/META-INF/libs/windows/libs64/libgcc_s_sjlj_64-1.dll
deleted file mode 100644
index 3ea8347..0000000
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs64/libgcc_s_sjlj_64-1.dll and /dev/null differ
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs64/libjpeg-9.dll b/Libs/src/main/resources/META-INF/libs/windows/libs64/libjpeg-9.dll
index 6763a31..b48d199 100644
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs64/libjpeg-9.dll and b/Libs/src/main/resources/META-INF/libs/windows/libs64/libjpeg-9.dll differ
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs64/liblept-2.dll b/Libs/src/main/resources/META-INF/libs/windows/libs64/liblept-2.dll
deleted file mode 100644
index 95bda4b..0000000
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs64/liblept-2.dll and /dev/null differ
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs64/libopencv_core244.dll b/Libs/src/main/resources/META-INF/libs/windows/libs64/libopencv_core244.dll
deleted file mode 100644
index f11b5cc..0000000
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs64/libopencv_core244.dll and /dev/null differ
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs64/libopencv_highgui244.dll b/Libs/src/main/resources/META-INF/libs/windows/libs64/libopencv_highgui244.dll
deleted file mode 100644
index 08139aa..0000000
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs64/libopencv_highgui244.dll and /dev/null differ
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs64/libopencv_imgproc244.dll b/Libs/src/main/resources/META-INF/libs/windows/libs64/libopencv_imgproc244.dll
deleted file mode 100644
index 950f419..0000000
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs64/libopencv_imgproc244.dll and /dev/null differ
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs64/libpng15-15.dll b/Libs/src/main/resources/META-INF/libs/windows/libs64/libpng15-15.dll
index d1350e6..b4d788a 100644
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs64/libpng15-15.dll and b/Libs/src/main/resources/META-INF/libs/windows/libs64/libpng15-15.dll differ
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs64/libstdc++_64-6.dll b/Libs/src/main/resources/META-INF/libs/windows/libs64/libstdc++_64-6.dll
deleted file mode 100644
index 0965246..0000000
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs64/libstdc++_64-6.dll and /dev/null differ
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs64/libtesseract-3.dll b/Libs/src/main/resources/META-INF/libs/windows/libs64/libtesseract-3.dll
index 5050603..3ec4445 100644
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs64/libtesseract-3.dll and b/Libs/src/main/resources/META-INF/libs/windows/libs64/libtesseract-3.dll differ
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs64/zlib1.dll b/Libs/src/main/resources/META-INF/libs/windows/libs64/zlib1.dll
deleted file mode 100644
index 1713388..0000000
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs64/zlib1.dll and /dev/null differ

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



More information about the pkg-java-commits mailing list