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

4
modules/highgui/src/window_w32.cpp
View File

@@ -41,7 +41,7 @@
#include "precomp.hpp"
#if defined WIN32 || defined WIN64 || defined _WIN64
#if defined WIN32 || defined _WIN32
#if _MSC_VER >= 1200
#pragma warning( disable: 4710 )
@@ -57,7 +57,7 @@
static const char* trackbar_text =
" ";
#if defined WIN64 || defined _WIN64
#if defined _M_X64 || defined __x86_64
#define icvGetWindowLongPtr GetWindowLongPtr
#define icvSetWindowLongPtr( hwnd, id, ptr ) SetWindowLongPtr( hwnd, id, (LONG_PTR)(ptr) )