projects
/
occt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
248622f
)
0023101: TKOpenGl possible glext header conflicts
author
kgv
<kgv@opencascade.com>
Thu, 12 Apr 2012 04:55:12 +0000
(08:55 +0400)
committer
kgv
<kgv@opencascade.com>
Thu, 12 Apr 2012 13:23:36 +0000
(17:23 +0400)
src/OpenGl/OpenGl_GlCore11.hxx
patch
|
blob
|
blame
|
history
diff --git
a/src/OpenGl/OpenGl_GlCore11.hxx
b/src/OpenGl/OpenGl_GlCore11.hxx
index
b3dfeb2
..
cca428a
100644
(file)
--- a/
src/OpenGl/OpenGl_GlCore11.hxx
+++ b/
src/OpenGl/OpenGl_GlCore11.hxx
@@
-41,9
+41,11
@@
// current TKOpenGl implementation is incompatible with native OpenGL on MacOS X
#define MACOSX_USE_GLX
+// exclude modern definitions and system-provided glext.h, should be defined before gl.h inclusion
+#define GL_GLEXT_LEGACY
+
// include main OpenGL header provided with system
#if defined(__APPLE__) && !defined(MACOSX_USE_GLX)
- #define GL_GLEXT_LEGACY // exclude modern definitions
#include <OpenGL/OpenGL.h>
#else
#include <GL/gl.h>