WINVER fixes for MinGW and VC++.

This commit is contained in:
Camilla Berglund 2014-02-10 21:12:20 +01:00
parent 9beba1ba31
commit d0d2332193
2 changed files with 9 additions and 7 deletions

View File

@ -175,8 +175,9 @@ if (_GLFW_WIN32)
# the inclusion of stddef.h (by glfw3.h), which is itself included before # the inclusion of stddef.h (by glfw3.h), which is itself included before
# win32_platform.h. We define them here until a saner solution can be found # win32_platform.h. We define them here until a saner solution can be found
# NOTE: MinGW-w64 and Visual C++ do /not/ need this hack. # NOTE: MinGW-w64 and Visual C++ do /not/ need this hack.
add_definitions(-DUNICODE) if (CMAKE_COMPILER_IS_GNUC)
add_definitions(-DWINVER=0x0501) add_definitions(-DUNICODE -DWINVER=0x0501)
endif()
endif() endif()
#-------------------------------------------------------------------- #--------------------------------------------------------------------

View File

@ -80,17 +80,18 @@
#ifndef WM_COPYGLOBALDATA #ifndef WM_COPYGLOBALDATA
#define WM_COPYGLOBALDATA 0x0049 #define WM_COPYGLOBALDATA 0x0049
#endif #endif
#ifndef MSGFLT_ALLOW
#define MSGFLT_ALLOW 1
#endif
#if defined(__MINGW32__) #if WINVER < 0x0601
typedef struct tagCHANGEFILTERSTRUCT typedef struct tagCHANGEFILTERSTRUCT
{ {
DWORD cbSize; DWORD cbSize;
DWORD ExtStatus; DWORD ExtStatus;
} CHANGEFILTERSTRUCT, *PCHANGEFILTERSTRUCT; } CHANGEFILTERSTRUCT, *PCHANGEFILTERSTRUCT;
#endif /*__MINGW32__*/ #ifndef MSGFLT_ALLOW
#define MSGFLT_ALLOW 1
#endif
#endif /*Windows 7*/
//======================================================================== //========================================================================