From 15cdd661a4bec0d719adb76f785f35e0990fc24b Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Sun, 30 Oct 2016 16:05:00 -0700
Subject: [PATCH] Simplify OpenCV dependencies.

Depends on https://github.com/wpilibsuite/opencv/pull/6
---
 dependencies.gradle | 43 ++++---------------------------------------
 1 file changed, 4 insertions(+), 39 deletions(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index 4ee2eace75..05a852b53d 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -349,46 +349,11 @@ ext.useOpenCv = { project ->
         if (project.includeJava) {
             compileTask.dependsOn "unzipOpenCvJni_${openCvPlatform}"
         }
-        if (targetPlatform.architecture.arm) {
-            linker.args "${openCvNativesFolder}/libopencv_calib3d.so"
-            linker.args "${openCvNativesFolder}/libopencv_features2d.so"
-            linker.args "${openCvNativesFolder}/libopencv_flann.so"
-            linker.args "${openCvNativesFolder}/libopencv_highgui.so"
-            linker.args "${openCvNativesFolder}/libopencv_imgcodecs.so"
-            linker.args "${openCvNativesFolder}/libopencv_imgproc.so"
-            linker.args "${openCvNativesFolder}/libopencv_ml.so"
-            linker.args "${openCvNativesFolder}/libopencv_objdetect.so"
-            linker.args "${openCvNativesFolder}/libopencv_photo.so"
-            linker.args "${openCvNativesFolder}/libopencv_shape.so"
-            linker.args "${openCvNativesFolder}/libopencv_stitching.so"
-            linker.args "${openCvNativesFolder}/libopencv_superres.so"
-            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"
+        if (targetPlatform.operatingSystem.windows) {
+            linker.args "${openCvNativesFolder}/opencv.lib"
         } else {
-            linker.args "${openCvNativesFolder}/libopencv_calib3d.a"
-            linker.args "${openCvNativesFolder}/libopencv_features2d.a"
-            linker.args "${openCvNativesFolder}/libopencv_flann.a"
-            linker.args "${openCvNativesFolder}/libopencv_highgui.a"
-            linker.args "${openCvNativesFolder}/libopencv_imgcodecs.a"
-            linker.args "${openCvNativesFolder}/libopencv_imgproc.a"
-            linker.args "${openCvNativesFolder}/libopencv_ml.a"
-            linker.args "${openCvNativesFolder}/libopencv_objdetect.a"
-            linker.args "${openCvNativesFolder}/libopencv_photo.a"
-            linker.args "${openCvNativesFolder}/libopencv_shape.a"
-            linker.args "${openCvNativesFolder}/libopencv_stitching.a"
-            linker.args "${openCvNativesFolder}/libopencv_superres.a"
-            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 "-L${openCvNativesFolder}"
+            linker.args "-lopencv"
             linker.args "-ldl"
             linker.args "-lz"
         }