Adding support for WinRT(WinPhone 8/8.1 and Win Store) via CMake 3.1
- Substituted HAVE_WINRT with WINRT - Fixed compilation issues in ocl.cpp and parallel.cpp - Fixed compiler issue for WP8: "C2678: binary '+' : no operator found which takes a left-hand - Fixed gitignore - Added #ifdef HAVE_OPENCL to remove compiler warnings in ocl.cpp - Used NO_GETENV similar to '3rdparty\libjpeg\jmemmgr.c; - Added ole32.lib for core module (for WindowsStore 8.0 builds) - Made OpenCV_ARCH aware of ARM Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
set(the_description "The ts module")
|
||||
|
||||
if(IOS)
|
||||
if(IOS OR WINRT)
|
||||
ocv_module_disable(ts)
|
||||
endif()
|
||||
|
||||
|
@@ -6,7 +6,7 @@
|
||||
|
||||
#include "cvconfig.h"
|
||||
|
||||
#ifdef HAVE_WINRT
|
||||
#ifdef WINRT
|
||||
#pragma warning(disable:4447) // Disable warning 'main' signature found without threading model
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user