Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-01 02:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

build.gradle: Fix OpenCV library order.

Browse Source 
Also include OpenCV-built liblibjpeg.a and liblibpng.a.
This commit is contained in:
Peter Johnson
2016-10-28 00:51:03 -07:00
parent e10b399f51
commit d7efd62511
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@@ -244,7 +244,6 @@ ext.useOpenCv = { project ->
}
if (targetPlatform.architecture.arm) {
linker.args "${openCvNativesFolder}/libopencv_calib3d.so"
linker.args "${openCvNativesFolder}/libopencv_core.so"
linker.args "${openCvNativesFolder}/libopencv_features2d.so"
linker.args "${openCvNativesFolder}/libopencv_flann.so"
linker.args "${openCvNativesFolder}/libopencv_highgui.so"
@@ -259,13 +258,13 @@ ext.useOpenCv = { project ->
linker.args "${openCvNativesFolder}/libopencv_video.so"
linker.args "${openCvNativesFolder}/libopencv_videoio.so"
linker.args "${openCvNativesFolder}/libopencv_videostab.so"
linker.args "${openCvNativesFolder}/libopencv_core.so"
linker.args "-ldl"
linker.args "-lz"
} else if (targetPlatform.operatingSystem.windows) {
linker.args "${openCvNativesFolder}/opencv_core.lib"
} else {
linker.args "${openCvNativesFolder}/libopencv_calib3d.a"
linker.args "${openCvNativesFolder}/libopencv_core.a"
linker.args "${openCvNativesFolder}/libopencv_features2d.a"
linker.args "${openCvNativesFolder}/libopencv_flann.a"
linker.args "${openCvNativesFolder}/libopencv_highgui.a"
@@ -280,6 +279,9 @@ ext.useOpenCv = { project ->
linker.args "${openCvNativesFolder}/libopencv_video.a"
linker.args "${openCvNativesFolder}/libopencv_videoio.a"
linker.args "${openCvNativesFolder}/libopencv_videostab.a"
linker.args "${openCvNativesFolder}/libopencv_core.a"
linker.args "${openCvNativesFolder}/liblibjpeg.a"
linker.args "${openCvNativesFolder}/liblibpng.a"
linker.args "-ldl"
linker.args "-lz"
}