diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2011-05-11 03:54:15 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2011-05-11 03:54:15 +0400 |
| commit | 56c5d71f1ce79160d6a3fffbbc1f78a10d0e2686 (patch) | |
| tree | 5da3f4decb79f0f8d09169e14f92de9d30445bc0 /intern | |
| parent | fab1ee1f78cd0cba92053e6b569f0cb6126ca2ca (diff) | |
Apply patch from Ryakiotakis Antonis as posted on ML
Should fix MingW build problems - mingw users, please test too :)
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemWin32.cpp | 2 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemWin32.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index 455a166ece0..ee8ec9e8018 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -42,7 +42,7 @@ #include <iostream> #ifdef FREE_WINDOWS -# define _WIN32_WINNT 0x0500 /* GetConsoleWindow() for MinGW */ +# define WINVER 0x0501 /* GetConsoleWindow() for MinGW */ #endif #include "GHOST_SystemWin32.h" diff --git a/intern/ghost/intern/GHOST_SystemWin32.h b/intern/ghost/intern/GHOST_SystemWin32.h index 27c0cf33314..729ad56d875 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.h +++ b/intern/ghost/intern/GHOST_SystemWin32.h @@ -130,8 +130,6 @@ DECLARE_HANDLE(HRAWINPUT); #ifdef FREE_WINDOWS #define NEED_RAW_PROC typedef BOOL (WINAPI * LPFNDLLRRID)(RAWINPUTDEVICE*,UINT, UINT); -#define RegisterRawInputDevices(pRawInputDevices, uiNumDevices, cbSize) ((pRegisterRawInputDevices)?pRegisterRawInputDevices(pRawInputDevices, uiNumDevices, cbSize):0) - typedef UINT (WINAPI * LPFNDLLGRID)(HRAWINPUT, UINT, LPVOID, PUINT, UINT); #define GetRawInputData(hRawInput, uiCommand, pData, pcbSize, cbSizeHeader) ((pGetRawInputData)?pGetRawInputData(hRawInput, uiCommand, pData, pcbSize, cbSizeHeader):(UINT)-1) |