OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-19 13:40:49 +03:00
Code Activity

0023238: TKOpenGl glext header conflicts with system headers

Browse Source
This commit is contained in:
kgv
2012-07-03 16:45:17 +04:00
parent 3c4153af69
commit be34de4b94
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -3,6 +3,7 @@
/.adm
/sun
/lin
/mac
/ao1
/sil
/wnt
@@ -15,3 +16,5 @@
# /adm/
/adm/win32
/adm/win64
/adm/mac
/adm/lin

2
src/OpenGl/OpenGl_GlCore11.hxx
View File

@@ -46,7 +46,7 @@
// include main OpenGL header provided with system
#if defined(__APPLE__)
#include <OpenGL/OpenGL.h>
#include <OpenGL/gl.h>
#include <OpenGL/glu.h>
#define __X_GL_H // prevent chaotic gl.h inclusions to avoid compile errors
#else