Zengtudor/glew-cmake
1
0
Fork 0
mirror of https://github.com/Perlmint/glew-cmake.git synced 2024-11-11 09:33:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move #undef NOGDI from wglew_head.h to glew_head.c

Browse Source
This commit is contained in:
Dillon Cower 2016-08-27 22:59:50 -07:00
parent 4a0d48fc7c
commit 2ca0184814
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
auto/src/glew_head.c
View File

@ -6,6 +6,14 @@
#elif defined(GLEW_EGL) #elif defined(GLEW_EGL)
# include <GL/eglew.h> # include <GL/eglew.h>
#elif defined(_WIN32) #elif defined(_WIN32)
/*
* If NOGDI is defined, wingdi.h won't be included by windows.h, and thus
* wglGetProcAddress won't be declared. It will instead be implicitly declared,
* potentially incorrectly, which we don't want.
*/
# if defined(NOGDI)
# undef NOGDI
# endif
# include <GL/wglew.h> # include <GL/wglew.h>
#elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) #elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))
# include <GL/glxew.h> # include <GL/glxew.h>

8
auto/src/wglew_head.h
View File

@ -12,14 +12,6 @@
# ifndef WIN32_LEAN_AND_MEAN # ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN 1 # define WIN32_LEAN_AND_MEAN 1
# endif # endif
/*
* If NOGDI is defined, wingdi.h won't be included by windows.h, and thus
* wglGetProcAddress won't be declared. It will instead be implicitly declared
* incorrectly, which we don't want.
*/
# if defined(NOGDI)
# undef NOGDI
# endif
#include <windows.h> #include <windows.h>
# undef WIN32_LEAN_AND_MEAN # undef WIN32_LEAN_AND_MEAN
#endif #endif