mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 06:03:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #27 from sergiud/master

Browse Source
This commit is contained in:
Andrey Kamaev 2012-08-30 23:15:58 +04:00
commit 11e16a7204
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmake/OpenCVFindLibsVideo.cmake
View File

@ -169,12 +169,11 @@ endif(WITH_VIDEOINPUT)
# --- Extra HighGUI libs on Windows ---
if(WIN32)
list(APPEND HIGHGUI_LIBRARIES comctl32 gdi32 ole32)
if(MSVC)
list(APPEND HIGHGUI_LIBRARIES vfw32)
elseif(MINGW64)
list(APPEND HIGHGUI_LIBRARIES msvfw32 avifil32 avicap32 winmm)
list(APPEND HIGHGUI_LIBRARIES comctl32 gdi32 ole32 vfw32)
if(MINGW64)
list(APPEND HIGHGUI_LIBRARIES avifil32 avicap32 winmm msvfw32)
list(REMOVE_ITEM HIGHGUI_LIBRARIES vfw32)
elseif(MINGW)
list(APPEND HIGHGUI_LIBRARIES vfw32 winmm)
list(APPEND HIGHGUI_LIBRARIES winmm)
endif()
endif(WIN32)

1
modules/highgui/CMakeLists.txt
View File

@ -107,7 +107,6 @@ endif()
if(WIN32)
list(APPEND highgui_srcs src/cap_vfw.cpp src/cap_cmu.cpp src/cap_dshow.cpp)
list(APPEND HIGHGUI_LIBRARIES vfw32)
endif(WIN32)
if(HAVE_XINE)