From 91c519467decaf9bcd99d88c7889d9e85bb29a3d Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Thu, 20 Jun 2013 00:46:56 -0700 Subject: [PATCH] WinRT build fix for samples and static libs. --- platforms/winrt/arm.winrt.toolchain.cmake | 9 ++------- samples/cpp/latentsvm_multidetect.cpp | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/platforms/winrt/arm.winrt.toolchain.cmake b/platforms/winrt/arm.winrt.toolchain.cmake index ac9af117df..81bb57fe67 100644 --- a/platforms/winrt/arm.winrt.toolchain.cmake +++ b/platforms/winrt/arm.winrt.toolchain.cmake @@ -8,10 +8,5 @@ add_definitions(-D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE) set(CMAKE_CXX_FLAGS "" CACHE STRING "c++ flags") set(CMAKE_C_FLAGS "" CACHE STRING "c flags") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ZW -EHsc -GS") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -GS") - - -set(CMAKE_SHARED_LINKER_FLAGS "/r:System.Runtime.WindowsRuntime.dll /r:System.Threading.Tasks.dll" CACHE STRING "shared linker flags") -set(CMAKE_MODULE_LINKER_FLAGS "/r:System.Runtime.WindowsRuntime.dll /r:System.Threading.Tasks.dll" CACHE STRING "module linker flags") -set(CMAKE_EXE_LINKER_FLAGS "/r:System.Runtime.WindowsRuntime.dll /r:System.Threading.Tasks.dll" CACHE STRING "executable linker flags") \ No newline at end of file +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -EHsc -GS") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -GS") \ No newline at end of file diff --git a/samples/cpp/latentsvm_multidetect.cpp b/samples/cpp/latentsvm_multidetect.cpp index d2105122ab..619c54b849 100644 --- a/samples/cpp/latentsvm_multidetect.cpp +++ b/samples/cpp/latentsvm_multidetect.cpp @@ -3,7 +3,7 @@ #include "opencv2/highgui/highgui.hpp" #include "opencv2/contrib/contrib.hpp" -#ifdef WIN32 +#if defined(WIN32) || defined(_WIN32) #include #else #include @@ -67,7 +67,7 @@ static void readDirectory( const string& directoryName, vector& filename { filenames.clear(); -#ifdef WIN32 +#if defined(WIN32) | defined(_WIN32) struct _finddata_t s_file; string str = directoryName + "\\*.*";