Zengtudor
/
glew
mirror of https://github.com/nigels-com/glew.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into subset

This commit is contained in:
Nigel Stewart 2011-01-18 17:55:40 -06:00
parent 77459379aa a23e5e5d6d
commit 07bc36b14c
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auto/core/GL_EXT_secondary_color
View File

@ -24,4 +24,4 @@ GL_EXT_secondary_color
void glSecondaryColor3uivEXT (const GLuint *v) void glSecondaryColor3uivEXT (const GLuint *v)
void glSecondaryColor3usEXT (GLushort red, GLushort green, GLushort blue) void glSecondaryColor3usEXT (GLushort red, GLushort green, GLushort blue)
void glSecondaryColor3usvEXT (const GLushort *v) void glSecondaryColor3usvEXT (const GLushort *v)
void glSecondaryColorPointerEXT (GLint size, GLenum type, GLsizei stride, GLvoid *pointer) void glSecondaryColorPointerEXT (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)

2
auto/core/GL_VERSION_1_4
View File

@ -69,7 +69,7 @@ http://www.opengl.org/documentation/specs/version1.4/glspec14.pdf
void glSecondaryColor3uiv (const GLuint *v) void glSecondaryColor3uiv (const GLuint *v)
void glSecondaryColor3us (GLushort red, GLushort green, GLushort blue) void glSecondaryColor3us (GLushort red, GLushort green, GLushort blue)
void glSecondaryColor3usv (const GLushort *v) void glSecondaryColor3usv (const GLushort *v)
void glSecondaryColorPointer (GLint size, GLenum type, GLsizei stride, GLvoid *pointer) void glSecondaryColorPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
void glBlendFuncSeparate (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha) void glBlendFuncSeparate (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
void glWindowPos2d (GLdouble x, GLdouble y) void glWindowPos2d (GLdouble x, GLdouble y)
void glWindowPos2f (GLfloat x, GLfloat y) void glWindowPos2f (GLfloat x, GLfloat y)

20
auto/src/glew_head.h
View File

@ -94,9 +94,10 @@ typedef _W64 int ptrdiff_t;
#endif #endif
/* /*
* GLEW_STATIC needs to be set when using the static version. * GLEW_STATIC is defined for static library.
* GLEW_BUILD is set when building the DLL version. * GLEW_BUILD is defined for building the DLL library.
*/ */
#ifdef GLEW_STATIC #ifdef GLEW_STATIC
# define GLEWAPI extern # define GLEWAPI extern
#else #else
@ -130,7 +131,22 @@ typedef _W64 int ptrdiff_t;
#define GLEW_APIENTRY_DEFINED #define GLEW_APIENTRY_DEFINED
#define APIENTRY #define APIENTRY
/*
* GLEW_STATIC is defined for static library.
*/
#ifdef GLEW_STATIC
# define GLEWAPI extern # define GLEWAPI extern
#else
# if defined(__GNUC__) && __GNUC__>=4
# define GLEWAPI extern __attribute__ ((visibility("default")))
# elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
# define GLEWAPI extern __global
# else
# define GLEWAPI extern
# endif
#endif
/* <glu.h> */ /* <glu.h> */
#ifndef GLAPI #ifndef GLAPI