FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved the GL3 include to within the code block that handles GL1/GL2

Browse Source
This commit is contained in:
Robert Osfield 2010-12-20 12:17:40 +00:00
parent 959b8e6d1d
commit c9c329e7c4
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/osg/GL
View File

@ -37,14 +37,6 @@
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#endif #endif
#elif defined(OSG_GL3_AVAILABLE)
#define GL3_PROTOTYPES 1
#include <GL3/gl3.h>
#ifndef GL_APIENTRY
#define GL_APIENTRY APIENTRY
#endif // GL_APIENTRY
#else #else
@ -111,6 +103,12 @@
#endif // WIN32 #endif // WIN32
#if defined(OSG_GL3_AVAILABLE)
#define GL3_PROTOTYPES 1
#include <GL3/gl3.h>
#else
#ifndef __gl_h_ #ifndef __gl_h_
#ifdef __APPLE__ #ifdef __APPLE__
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
@ -118,6 +116,7 @@
#include <GL/gl.h> #include <GL/gl.h>
#endif #endif
#endif #endif
#endif
#ifndef GL_APIENTRY #ifndef GL_APIENTRY
#define GL_APIENTRY APIENTRY #define GL_APIENTRY APIENTRY