From 588ca5d12675d652324b709f0450c842dee00b85 Mon Sep 17 00:00:00 2001 From: Emanuele Ruffaldi Date: Sat, 19 Aug 2017 23:51:02 +0200 Subject: [PATCH] videoio for mingw32: added STRSAFE_NO_DEPRECATE and realpath --- modules/videoio/CMakeLists.txt | 3 +++ modules/videoio/src/cap_gstreamer.cpp | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/modules/videoio/CMakeLists.txt b/modules/videoio/CMakeLists.txt index 086e223..0033ae7 100644 --- a/modules/videoio/CMakeLists.txt +++ b/modules/videoio/CMakeLists.txt @@ -78,6 +78,9 @@ endif() if (WIN32 AND HAVE_DSHOW) list(APPEND videoio_srcs ${CMAKE_CURRENT_LIST_DIR}/src/cap_dshow.cpp) list(APPEND videoio_hdrs ${CMAKE_CURRENT_LIST_DIR}/src/cap_dshow.hpp) + if (MINGW64) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTRSAFE_NO_DEPRECATE") + endif() endif() if (WIN32 AND HAVE_MSMF) diff --git a/modules/videoio/src/cap_gstreamer.cpp b/modules/videoio/src/cap_gstreamer.cpp index a3ece26..192d173 100644 --- a/modules/videoio/src/cap_gstreamer.cpp +++ b/modules/videoio/src/cap_gstreamer.cpp @@ -87,6 +87,12 @@ #endif #if defined(_WIN32) || defined(_WIN64) +#if defined(__MINGW32__) +inline char *realpath(const char *path, char *resolved_path) +{ + return _fullpath(resolved_path,path,PATH_MAX); +} +#endif #define snprintf _snprintf #define vsnprintf _vsnprintf #define strcasecmp _stricmp -- 2.7.4