From d88789e5e36914fd401c8a6701c270e0f8d7ee25 Mon Sep 17 00:00:00 2001
From: Camilla Berglund <elmindreda@elmindreda.org>
Date: Fri, 16 Sep 2011 04:44:40 +0200
Subject: [PATCH] Added GLFW_INCLUDE_GL3 macro.

---
 include/GL/glfw3.h | 26 +++++++++++++++++---------
 readme.html        |  1 +
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/include/GL/glfw3.h b/include/GL/glfw3.h
index d583c364..2271fc3f 100644
--- a/include/GL/glfw3.h
+++ b/include/GL/glfw3.h
@@ -158,16 +158,24 @@ extern "C" {
  * (which is not a nice solution for portable programs).
  */
 #if defined(__APPLE_CC__)
- #define GL_GLEXT_LEGACY
- #include <OpenGL/gl.h>
- #ifndef GLFW_NO_GLU
-  #include <OpenGL/glu.h>
- #endif
+  #if defined(GLFW_INCLUDE_GL3)
+    #include <OpenGL/gl3.h>
+  #else
+    #define GL_GLEXT_LEGACY
+    #include <OpenGL/gl.h>
+  #endif
+  #ifndef GLFW_NO_GLU
+    #include <OpenGL/glu.h>
+  #endif
 #else
- #include <GL/gl.h>
- #ifndef GLFW_NO_GLU
-  #include <GL/glu.h>
- #endif
+  #if defined(GLFW_INCLUDE_GL3)
+    #include <GL3/gl3.h>
+  #else
+    #include <GL/gl.h>
+  #endif
+  #ifndef GLFW_NO_GLU
+    #include <GL/glu.h>
+  #endif
 #endif
 
 
diff --git a/readme.html b/readme.html
index f93c0dda..b933810a 100644
--- a/readme.html
+++ b/readme.html
@@ -278,6 +278,7 @@ version of GLFW.</p>
   <li>Added <code>GLFW_OPENGL_ES2_PROFILE</code> profile for creating OpenGL ES 2.0 contexts using the <code>GLX_EXT_create_context_es2_profile</code> and <code>WGL_EXT_create_context_es2_profile</code> extensions</li>
   <li>Added <code>GLFW_OPENGL_ROBUSTNESS</code> window hint and associated strategy tokens for <code>GL_ARB_robustness</code> support</li>
   <li>Added <code>GLFW_OPENGL_REVISION</code> window parameter to make up for removal of <code>glfwGetGLVersion</code></li>
+  <li>Added <code>GLFW_INCLUDE_GL3</code> macro for telling the GLFW header to include <code>gl3.h</code> header instead of <code>gl.h</code></li>
   <li>Added <code>windows</code> simple multi-window test program</li>
   <li>Added <code>sharing</code> simple OpenGL object sharing test program</li>
   <li>Added a parameter to <code>glfwOpenWindow</code> for specifying a context the new window's context will share objects with</li>