From edbca390ede061629453c5cb37cd1e158486a7dd Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Thu, 5 Apr 2018 11:21:55 +0200 Subject: [PATCH] mingw: fix compile error in GraphicsWindowWin32.cpp compilation error was introduced by msvc specific change see https://github.com/openscenegraph/OpenSceneGraph/commit/bb169979a1054e2fa63a7ea82c9c8bec87e90494 --- src/osgViewer/GraphicsWindowWin32.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osgViewer/GraphicsWindowWin32.cpp b/src/osgViewer/GraphicsWindowWin32.cpp index 160e90f35..ff25d30a9 100644 --- a/src/osgViewer/GraphicsWindowWin32.cpp +++ b/src/osgViewer/GraphicsWindowWin32.cpp @@ -33,7 +33,7 @@ #define MOUSEEVENTF_FROMTOUCH 0xFF515700 // _MSC_VER 1500: VS 2008 -#if(WINVER < 0x0601 || _MSC_VER <= 1500) +#if(WINVER < 0x0601 || (_MSC_VER <= 1500 && !__MINGW32__)) // Provide Declarations for Multitouch #define WM_TOUCH 0x0240 @@ -87,7 +87,7 @@ typedef TOUCHINPUT const * PCTOUCHINPUT; // for Windows 8 and above // _MSC_VER 1600: VS 2010 -#if(WINVER < 0x0602 || _MSC_VER <= 1600) +#if(WINVER < 0x0602 || (_MSC_VER <= 1600 && !__MINGW32__)) #define WM_POINTERUPDATE 0x0245 #define WM_POINTERDOWN 0x0246