Add support for #define GLEW_NO_GLU, contributed by Stefan Eilemann

This commit is contained in:
Nigel Stewart 2011-02-15 10:21:17 -06:00
parent 8b64761d8d
commit 29b1af417a
2 changed files with 9 additions and 4 deletions

View File

@ -1080,10 +1080,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

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 */