From c6cab50c5cb2c789e654acad3f4a0f6d58dc069a Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Thu, 28 Mar 2013 00:01:52 -0700 Subject: [PATCH] Perf tests for Video IO on WInRT fixed. --- modules/highgui/perf/perf_precomp.hpp | 8 +++++--- platforms/winrt/arm.winrt.toolchain.cmake | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/highgui/perf/perf_precomp.hpp b/modules/highgui/perf/perf_precomp.hpp index b43e038f6..529187d3b 100644 --- a/modules/highgui/perf/perf_precomp.hpp +++ b/modules/highgui/perf/perf_precomp.hpp @@ -20,8 +20,9 @@ defined(HAVE_GSTREAMER) || \ defined(HAVE_QUICKTIME) || \ defined(HAVE_AVFOUNDATION) || \ - /*defined(HAVE_OPENNI) || too specialized */ \ - defined(HAVE_FFMPEG) + defined(HAVE_FFMPEG) || \ + defined(HAVE_VFW) + /*defined(HAVE_OPENNI) too specialized */ \ # define BUILD_WITH_VIDEO_INPUT_SUPPORT 1 #else @@ -32,7 +33,8 @@ defined(HAVE_GSTREAMER) || \ defined(HAVE_QUICKTIME) || \ defined(HAVE_AVFOUNDATION) || \ - defined(HAVE_FFMPEG) + defined(HAVE_FFMPEG) || \ + defined(HAVE_VFW) # define BUILD_WITH_VIDEO_OUTPUT_SUPPORT 1 #else # define BUILD_WITH_VIDEO_OUTPUT_SUPPORT 0 diff --git a/platforms/winrt/arm.winrt.toolchain.cmake b/platforms/winrt/arm.winrt.toolchain.cmake index 01854b598..e8767f297 100644 --- a/platforms/winrt/arm.winrt.toolchain.cmake +++ b/platforms/winrt/arm.winrt.toolchain.cmake @@ -1,5 +1,5 @@ -set(CMAKE_SYSTEM_NAME Windows) # WindowsRT breaks cmake 2.8.10.2 and earler -set(CMAKE_SYSTEM_PROCESSOR "arm") +set(CMAKE_SYSTEM_NAME Windows) +set(CMAKE_SYSTEM_PROCESSOR "arm-v7a") set(CMAKE_REQUIRED_DEFINITIONS -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE) add_definitions(-D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE) \ No newline at end of file