1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00

Multiple fixes for WinRT

Fixed flann build with NEON;
Fixed Haming distance with NEON;
Honest cvRound for WinRT added;
cvRound test added;
Video IO with direct show disabled;
This commit is contained in:
Alexander Smorkalov
2013-03-26 17:19:52 -07:00
parent 7ec2b6bad0
commit 6f68640d4d
9 changed files with 59 additions and 54 deletions
+5 -10
View File
@@ -89,10 +89,8 @@ if(HAVE_QT)
if(${_have_flag})
set_source_files_properties(${_RCC_OUTFILES} PROPERTIES COMPILE_FLAGS -Wno-missing-declarations)
endif()
elseif(WIN32)
if (NOT ARM)
list(APPEND highgui_srcs src/window_w32.cpp)
endif()
elseif(WIN32 AND NOT ARM)
list(APPEND highgui_srcs src/window_w32.cpp)
elseif(HAVE_GTK)
list(APPEND highgui_srcs src/window_gtk.cpp)
elseif(APPLE)
@@ -107,12 +105,9 @@ elseif(APPLE)
endif()
endif()
if(WIN32)
list(APPEND highgui_srcs src/cap_dshow.cpp)
if (NOT ARM)
list(APPEND highgui_srcs src/cap_vfw.cpp src/cap_cmu.cpp)
endif()
endif(WIN32)
if(WIN32 AND NOT ARM)
list(APPEND highgui_srcs src/cap_dshow.cpp src/cap_vfw.cpp src/cap_cmu.cpp)
endif()
if(HAVE_XINE)
list(APPEND highgui_srcs src/cap_xine.cpp)