Zengtudor/glew
1
0
Fork 0
mirror of https://github.com/nigels-com/glew.git synced 2024-11-29 17:17:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into subset

Browse Source
This commit is contained in:
Nigel Stewart 2011-03-02 21:27:40 -06:00
commit 1431b290b6
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auto/src/glew_head.h
View File

@ -1094,10 +1094,12 @@ GLAPI void GLAPIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei heigh
/* ---------------------------------- GLU ---------------------------------- */ /* ---------------------------------- GLU ---------------------------------- */
#ifndef GLEW_NO_GLU
/* this is where we can safely include GLU */ /* this is where we can safely include GLU */
# if defined(__APPLE__) && defined(__MACH__) # if defined(__APPLE__) && defined(__MACH__)
# include <OpenGL/glu.h> # include <OpenGL/glu.h>
# else # else
# include <GL/glu.h> # include <GL/glu.h>
# endif # endif
#endif

3
src/visualinfo.c
View File

@ -161,10 +161,13 @@ main (int argc, char** argv)
fprintf(file, "OpenGL version string: %s\n", glGetString(GL_VERSION)); fprintf(file, "OpenGL version string: %s\n", glGetString(GL_VERSION));
fprintf(file, "OpenGL extensions (GL_): \n"); fprintf(file, "OpenGL extensions (GL_): \n");
PrintExtensions((char*)glGetString(GL_EXTENSIONS)); PrintExtensions((char*)glGetString(GL_EXTENSIONS));
#ifndef GLEW_NO_GLU
/* GLU extensions */ /* GLU extensions */
fprintf(file, "GLU version string: %s\n", gluGetString(GLU_VERSION)); fprintf(file, "GLU version string: %s\n", gluGetString(GLU_VERSION));
fprintf(file, "GLU extensions (GLU_): \n"); fprintf(file, "GLU extensions (GLU_): \n");
PrintExtensions((char*)gluGetString(GLU_EXTENSIONS)); PrintExtensions((char*)gluGetString(GLU_EXTENSIONS));
#endif
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
/* extensions string */ /* extensions string */