mirror of
https://github.com/nigels-com/glew.git
synced 2024-11-11 08:43:49 +00:00
*** empty log message ***
git-svn-id: https://glew.svn.sourceforge.net/svnroot/glew/trunk/glew@35 783a27ee-832a-0410-bc00-9f386506c6dd
This commit is contained in:
parent
46bfdc60f6
commit
7632a38c4e
@ -97,7 +97,7 @@
|
||||
|
||||
/*
|
||||
* GLEW does not include <windows.h> to avoid name space pollution.
|
||||
* GL needs APIENTRY, GLU needs CALLBACK, wchar_t, and GL_API
|
||||
* GL needs APIENTRY and WINGDIAPI, GLU needs CALLBACK, wchar_t, and GL_API
|
||||
* defined properly.
|
||||
*/
|
||||
/* <windef.h> */
|
||||
@ -123,17 +123,15 @@
|
||||
# endif
|
||||
#endif
|
||||
/* <wingdi.h> and <winnt.h> */
|
||||
//#ifndef WINGDIAPI
|
||||
//#define GLEW_WINGDIAPI_DEFINED
|
||||
//#define WINGDIAPI __declspec(dllimport)
|
||||
//#endif
|
||||
#ifndef WINGDIAPI
|
||||
#define GLEW_WINGDIAPI_DEFINED
|
||||
#define WINGDIAPI __declspec(dllimport)
|
||||
#endif
|
||||
/* <ctype.h> */
|
||||
#ifndef _WCHAR_T_DEFINED
|
||||
typedef unsigned short wchar_t;
|
||||
#define _WCHAR_T_DEFINED
|
||||
#endif
|
||||
/* <glu.h> */
|
||||
#define GLAPI extern
|
||||
|
||||
/*
|
||||
* GLEW_STATIC needs to be set when including the
|
||||
@ -154,12 +152,13 @@ typedef unsigned short wchar_t;
|
||||
|
||||
#define GLEW_APIENTRY_DEFINED
|
||||
#define APIENTRY
|
||||
#define GLAPI extern
|
||||
#define GLAPIENTRY
|
||||
#define GLEW_EXPORT
|
||||
|
||||
#endif /* _WIN32 */
|
||||
|
||||
/* <glu.h> */
|
||||
#define GLAPI extern
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
@ -4603,11 +4602,12 @@ extern GLEW_EXPORT const char* glewGetErrorString (GLint error);
|
||||
#undef CALLBACK
|
||||
#endif
|
||||
|
||||
//#ifdef GLEW_WINGDIAPI_DEFINED
|
||||
//#undef GLEW_WINGDIAPI_DEFINED
|
||||
//#undef WINGDIAPI
|
||||
//#endif
|
||||
#ifdef GLEW_WINGDIAPI_DEFINED
|
||||
#undef GLEW_WINGDIAPI_DEFINED
|
||||
#undef WINGDIAPI
|
||||
#endif
|
||||
|
||||
#undef GL_API
|
||||
#undef GLEW_EXPORT
|
||||
|
||||
#endif /* __glew_h__ */
|
||||
|
Loading…
Reference in New Issue
Block a user