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

2010-07-16 22:38:57 +00:00
parent ba60094aca
commit 758e826d2e
24 changed files with 74 additions and 43 deletions
--- a/modules/highgui/src/cap_mil.cpp
+++ b/modules/highgui/src/cap_mil.cpp
@@ -48,7 +48,7 @@
  #pragma comment(lib,"milmet2.lib")
 #endif

-#if defined WIN64 && defined EM64T && defined _MSC_VER && !defined __ICL
+#if defined _M_X64
  #pragma optimize("",off)
 #endif