From 97a70648406e8275cc6b9a489af7ef8c2acb807c Mon Sep 17 00:00:00 2001 From: AlexeyAB <alexeyab84@gmail.com> Date: Mon, 23 Oct 2017 15:44:31 +0000 Subject: [PATCH] Automatic opencv versioning --- src/yolo_console_dll.cpp | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/yolo_console_dll.cpp b/src/yolo_console_dll.cpp index 62ffef8..88813cc 100644 --- a/src/yolo_console_dll.cpp +++ b/src/yolo_console_dll.cpp @@ -19,11 +19,13 @@ #include "opencv2/core/version.hpp" #ifndef CV_VERSION_EPOCH #include "opencv2/videoio/videoio.hpp" -#pragma comment(lib, "opencv_world330.lib") +#define OPENCV_VERSION CVAUX_STR(CV_VERSION_MAJOR)""CVAUX_STR(CV_VERSION_MINOR)""CVAUX_STR(CV_VERSION_REVISION) +#pragma comment(lib, "opencv_world" OPENCV_VERSION ".lib") #else -#pragma comment(lib, "opencv_core2413.lib") -#pragma comment(lib, "opencv_imgproc2413.lib") -#pragma comment(lib, "opencv_highgui2413.lib") +#define OPENCV_VERSION CVAUX_STR(CV_VERSION_EPOCH)""CVAUX_STR(CV_VERSION_MAJOR)""CVAUX_STR(CV_VERSION_MINOR) +#pragma comment(lib, "opencv_core" OPENCV_VERSION ".lib") +#pragma comment(lib, "opencv_imgproc" OPENCV_VERSION ".lib") +#pragma comment(lib, "opencv_highgui" OPENCV_VERSION ".lib") #endif -- Gitblit v1.10.0