OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0023101: TKOpenGl possible glext header conflicts

Browse Source 
Fixed glext header conflict with system X11 gl.h on Mac OS X
System header provide syntactically different typedefs for some OpenGL functions (GLenum vs. GLint).
Fixed misprint in comments
This commit is contained in:
kgv 2012-06-15 11:56:23 +04:00
parent 50a0744c2c
commit b1db572cfc
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/OpenGl/OpenGl_GlCore11.hxx
View File

@ -45,8 +45,10 @@
#define GL_GLEXT_LEGACY
// include main OpenGL header provided with system
#if defined(__APPLE__) && !defined(MACOSX_USE_GLX)
#if defined(__APPLE__)
#include <OpenGL/OpenGL.h>
#include <OpenGL/glu.h>
#define __X_GL_H // prevent chaotic gl.h inclusions to avoid compile errors
#else
#include <GL/gl.h>
#include <GL/glu.h>