Merge https://github.com/nigels-com/glew.git into master HEAD at Tue Oct 14 17:44:11 GMT 2014

This commit is contained in:
omniavinco 2014-10-15 02:44:11 +09:00
commit 819f806107
6 changed files with 15 additions and 11 deletions

View File

@ -1,17 +1,20 @@
GLEW - The OpenGL Extension Wrangler Library
http://glew.sourceforge.net/
https://github.com/nigels-com/glew
See doc/index.html for more information. See doc/index.html for more information.
If you downloaded the tarball from the GLEW website, you just need to: If you downloaded the tarball from the GLEW website, you just need to:
Unix: Unix:
make extensions
make make
sudo -s sudo -s
make install make install
make clean make clean
Windows: Windows:

View File

@ -211,7 +211,7 @@ static GLboolean _glewStrSame (const GLubyte* a, const GLubyte* b, GLuint n)
return i == n ? GL_TRUE : GL_FALSE; return i == n ? GL_TRUE : GL_FALSE;
} }
static GLboolean _glewStrSame1 (GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb) static GLboolean _glewStrSame1 (const GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb)
{ {
while (*na > 0 && (**a == ' ' || **a == '\n' || **a == '\r' || **a == '\t')) while (*na > 0 && (**a == ' ' || **a == '\n' || **a == '\r' || **a == '\t'))
{ {
@ -232,7 +232,7 @@ static GLboolean _glewStrSame1 (GLubyte** a, GLuint* na, const GLubyte* b, GLuin
return GL_FALSE; return GL_FALSE;
} }
static GLboolean _glewStrSame2 (GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb) static GLboolean _glewStrSame2 (const GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb)
{ {
if(*na >= nb) if(*na >= nb)
{ {
@ -248,7 +248,7 @@ static GLboolean _glewStrSame2 (GLubyte** a, GLuint* na, const GLubyte* b, GLuin
return GL_FALSE; return GL_FALSE;
} }
static GLboolean _glewStrSame3 (GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb) static GLboolean _glewStrSame3 (const GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb)
{ {
if(*na >= nb) if(*na >= nb)
{ {

View File

@ -12,7 +12,7 @@ GLboolean glxewContextIsSupported (const GLXEWContext* ctx, const char* name)
GLboolean glxewIsSupported (const char* name) GLboolean glxewIsSupported (const char* name)
#endif #endif
{ {
GLubyte* pos = (GLubyte*)name; const GLubyte* pos = (const GLubyte*)name;
GLuint len = _glewStrLen(pos); GLuint len = _glewStrLen(pos);
GLboolean ret = GL_TRUE; GLboolean ret = GL_TRUE;
while (ret && len > 0) while (ret && len > 0)

View File

@ -4,7 +4,7 @@ GLboolean GLEWAPIENTRY glewContextIsSupported (const GLEWContext* ctx, const cha
GLboolean GLEWAPIENTRY glewIsSupported (const char* name) GLboolean GLEWAPIENTRY glewIsSupported (const char* name)
#endif #endif
{ {
GLubyte* pos = (GLubyte*)name; const GLubyte* pos = (const GLubyte*)name;
GLuint len = _glewStrLen(pos); GLuint len = _glewStrLen(pos);
GLboolean ret = GL_TRUE; GLboolean ret = GL_TRUE;
while (ret && len > 0) while (ret && len > 0)

View File

@ -12,7 +12,7 @@ GLboolean GLEWAPIENTRY wglewContextIsSupported (const WGLEWContext* ctx, const c
GLboolean GLEWAPIENTRY wglewIsSupported (const char* name) GLboolean GLEWAPIENTRY wglewIsSupported (const char* name)
#endif #endif
{ {
GLubyte* pos = (GLubyte*)name; const GLubyte* pos = (const GLubyte*)name;
GLuint len = _glewStrLen(pos); GLuint len = _glewStrLen(pos);
GLboolean ret = GL_TRUE; GLboolean ret = GL_TRUE;
while (ret && len > 0) while (ret && len > 0)

View File

@ -23,6 +23,7 @@ NAME = GLEW
WARN = -Wall -W WARN = -Wall -W
POPT = -O2 POPT = -O2
CFLAGS.EXTRA += -fPIC CFLAGS.EXTRA += -fPIC
CFLAGS.EXTRA += -Wcast-qual
BIN.SUFFIX = BIN.SUFFIX =
LIB.SONAME = lib$(NAME).so.$(SO_MAJOR) LIB.SONAME = lib$(NAME).so.$(SO_MAJOR)
LIB.DEVLNK = lib$(NAME).so LIB.DEVLNK = lib$(NAME).so