From Paul Martz, "This change to include/osg/GL correctly includes the OpenGL header on OSX 10.7 when building OSG trunk for GL3. It also adds some CPP defines for compatibility."

This commit is contained in:
Robert Osfield
2012-09-26 08:42:04 +00:00
parent 86a37616f7
commit 03047f3e7f

View File

@@ -106,7 +106,15 @@
#if defined(OSG_GL3_AVAILABLE)
#define GL3_PROTOTYPES 1
#include <GL3/gl3.h>
#ifdef __APPLE__
#include <OpenGL/OpenGL.h>
#include <OpenGL/gl3.h>
#define GLint64EXT GLint64
#define GLuint64EXT GLuint64
#define GL_BGRA_EXT GL_BGRA
#else
#include <GL3/gl3.h>
#endif
#else
#ifndef __gl_h_