Branch: Tag:

2016-12-05

2016-12-05 22:13:55 by Bill Welliver <bill@welliver.org>

GL: Don't try to include multiple gl.h.

MacOSX can have 2 GL installations: native and XQuartz. Prefer native to prevent compile errors.

23:   #ifdef HAVE_WINDEF_H   #include <windows.h>   #endif /* HAVE_WINDEF_H */ +  + /* OpenGL/gl.h, a MacOSX-ism, precludes GL/gl.h and GL/glx.h */ + #ifdef HAVE_OPENGL_GL_H + #include <OpenGL/gl.h> + #else   #ifdef HAVE_GL_GL_H   #include <GL/gl.h>   #endif /* HAVE_GL_GL_H */ - #ifdef HAVE_OPENGL_GL_H - #include <OpenGL/gl.h> - #endif /* HAVE_OPENGL_GL_H */ +    #ifdef HAVE_GL_GLX_H   #include <GL/glx.h>   #endif /* HAVE_GL_GLX_H */ -  + #endif /* HAVE_OPENGL_GL_H */    -  +  +    /* Restore INT64, INT32, INT16 and INT8. */   #include "pike_int_types.h"