generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

do not use WIN64/_WIN64 anymore - CMake did not set it anyway. Use WIN32 + __x86_64 or _M_X64 instead. Also, make VideoInput optional (WITH_VIDEOINPUT=ON/OFF) => now Mingw-dw2 can build OpenCV

Browse Source
This commit is contained in:
Vadim Pisarevsky
2010-07-16 22:38:57 +00:00
parent ba60094aca
commit 758e826d2e
24 changed files with 74 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/ml/include/opencv2/ml/ml.hpp
View File

@@ -51,13 +51,13 @@
#include "opencv2/core/core.hpp"
#include <limits.h>
#if defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64
#if defined WIN32 || defined _WIN32
#include <windows.h>
#endif
#else // SKIP_INCLUDES
#if defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64
#if defined WIN32 || defined _WIN32
#define CV_CDECL __cdecl
#define CV_STDCALL __stdcall
#else
@@ -86,14 +86,14 @@
#ifndef CV_INLINE
#if defined __cplusplus
#define CV_INLINE inline
#elif (defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64) && !defined __GNUC__
#elif (defined WIN32 || defined _WIN32) && !defined __GNUC__
#define CV_INLINE __inline
#else
#define CV_INLINE static
#endif
#endif /* CV_INLINE */
#if (defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64) && defined CVAPI_EXPORTS
#if (defined WIN32 || defined _WIN32) && defined CVAPI_EXPORTS
#define CV_EXPORTS __declspec(dllexport)
#else
#define CV_EXPORTS