diff options
Diffstat (limited to '2.3-1/macros/findDeps')
| -rw-r--r-- | 2.3-1/macros/findDeps/getAllHeaders.bin | bin | 32576 -> 32772 bytes | |||
| -rw-r--r-- | 2.3-1/macros/findDeps/getAllHeaders.sci | 3 | ||||
| -rw-r--r-- | 2.3-1/macros/findDeps/getAllInterfaces.bin | bin | 33876 -> 34096 bytes | |||
| -rw-r--r-- | 2.3-1/macros/findDeps/getAllInterfaces.sci | 3 | ||||
| -rw-r--r-- | 2.3-1/macros/findDeps/getAllLibraries.bin | bin | 2076 -> 7740 bytes | |||
| -rw-r--r-- | 2.3-1/macros/findDeps/getAllLibraries.sci | 28 | ||||
| -rw-r--r-- | 2.3-1/macros/findDeps/getAllSources.bin | bin | 193416 -> 193844 bytes | |||
| -rw-r--r-- | 2.3-1/macros/findDeps/getAllSources.sci | 4 |
8 files changed, 34 insertions, 4 deletions
diff --git a/2.3-1/macros/findDeps/getAllHeaders.bin b/2.3-1/macros/findDeps/getAllHeaders.bin Binary files differindex 2dad8e88..e934bc35 100644 --- a/2.3-1/macros/findDeps/getAllHeaders.bin +++ b/2.3-1/macros/findDeps/getAllHeaders.bin diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci index 846f8f6a..06963ca6 100644 --- a/2.3-1/macros/findDeps/getAllHeaders.sci +++ b/2.3-1/macros/findDeps/getAllHeaders.sci @@ -182,7 +182,8 @@ function allHeaders = getAllHeaders(SharedInfo) OpenCV_headers = [ "src/c/imageProcessing/includes/cvcore.h" - "src/c/imageProcessing/includes/cvhighgui.h"]; + "src/c/imageProcessing/includes/cvhighgui.h" + "src/c/imageProcessing/includes/cvimgproc.h"]; if Target == "StandAlone" allHeaders = Standalone_headers; diff --git a/2.3-1/macros/findDeps/getAllInterfaces.bin b/2.3-1/macros/findDeps/getAllInterfaces.bin Binary files differindex ee40b128..c46573a8 100644 --- a/2.3-1/macros/findDeps/getAllInterfaces.bin +++ b/2.3-1/macros/findDeps/getAllInterfaces.bin diff --git a/2.3-1/macros/findDeps/getAllInterfaces.sci b/2.3-1/macros/findDeps/getAllInterfaces.sci index 90975473..0f90d5cc 100644 --- a/2.3-1/macros/findDeps/getAllInterfaces.sci +++ b/2.3-1/macros/findDeps/getAllInterfaces.sci @@ -173,7 +173,8 @@ function allInterfaces = getAllInterfaces(SharedInfo) OpenCV_interfaces = [ "src/c/imageProcessing/interfaces/int_cvcore.h" - "src/c/imageProcessing/interfaces/int_cvhighgui.h"]; + "src/c/imageProcessing/interfaces/int_cvhighgui.h" + "src/c/imageProcessing/interfaces/int_cvimgproc.h"]; if Target == "StandAlone" allInterfaces = Standalone_interfaces; diff --git a/2.3-1/macros/findDeps/getAllLibraries.bin b/2.3-1/macros/findDeps/getAllLibraries.bin Binary files differindex c6d006fa..f016eba2 100644 --- a/2.3-1/macros/findDeps/getAllLibraries.bin +++ b/2.3-1/macros/findDeps/getAllLibraries.bin diff --git a/2.3-1/macros/findDeps/getAllLibraries.sci b/2.3-1/macros/findDeps/getAllLibraries.sci index 7cd8f912..2850abad 100644 --- a/2.3-1/macros/findDeps/getAllLibraries.sci +++ b/2.3-1/macros/findDeps/getAllLibraries.sci @@ -10,8 +10,34 @@ function allLibraries = getAllLibraries(SharedInfo) "src/c/hardware/rasberrypi/libraries/libgsl.a" ]; + RPi_cvlibs = [ + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_calib3d.so" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_contrib.so" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_core.so" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_features2d.so" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_flann.so" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_gpu.so" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_highgui.so" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_imgproc.so" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_legacy.so" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_ml.so" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_nonfree.so" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_objdetect.so" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_ocl.so" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_photo.so" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_stitching.so" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_superres.so" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_video.so" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_videostab.so" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_ts.a" +]; + if Target == "RPi" - allLibraries = RPi_libs; + allLibraries = RPi_libs; + if (SharedInfo.OpenCVUsed == %T) + allLibraries = cat(1,allLibraries,RPi_cvlibs) + end + else allLibraries = []; end diff --git a/2.3-1/macros/findDeps/getAllSources.bin b/2.3-1/macros/findDeps/getAllSources.bin Binary files differindex 974e9460..a6612baf 100644 --- a/2.3-1/macros/findDeps/getAllSources.bin +++ b/2.3-1/macros/findDeps/getAllSources.bin diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci index dafa5032..14326b6b 100644 --- a/2.3-1/macros/findDeps/getAllSources.sci +++ b/2.3-1/macros/findDeps/getAllSources.sci @@ -1040,8 +1040,10 @@ function allSources = getAllSources(SharedInfo) OpenCV_files = [ "src/c/imageProcessing/cvcore/imcvCreateImages.c" + "src/c/imageProcessing/cvcore/imcvGetImgSizes.c" "src/c/imageProcessing/cvhighgui/imcvLoadImages.c" - "src/c/imageProcessing/cvhighgui/imcvShowImages.c"]; + "src/c/imageProcessing/cvhighgui/imcvShowImages.c" + "src/c/imageProcessing/cvimgproc/imcvCvtColors.c"]; if Target == "StandAlone" allSources = Standalone_files; |