gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-23 02:38:52 -05:00
Code Issues Projects Releases Wiki Activity

Added GLFW_INCLUDE_GL3 macro.

Browse Source
This commit is contained in:
Camilla Berglund 2011-09-16 04:44:40 +02:00
parent d0af26cd43
commit d88789e5e3
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/GL/glfw3.h
View File

@ -158,16 +158,24 @@ extern "C" {
* (which is not a nice solution for portable programs). * (which is not a nice solution for portable programs).
*/ */
#if defined(__APPLE_CC__) #if defined(__APPLE_CC__)
#define GL_GLEXT_LEGACY #if defined(GLFW_INCLUDE_GL3)
#include <OpenGL/gl.h> #include <OpenGL/gl3.h>
#ifndef GLFW_NO_GLU #else
#include <OpenGL/glu.h> #define GL_GLEXT_LEGACY
#endif #include <OpenGL/gl.h>
#endif
#ifndef GLFW_NO_GLU
#include <OpenGL/glu.h>
#endif
#else #else
#include <GL/gl.h> #if defined(GLFW_INCLUDE_GL3)
#ifndef GLFW_NO_GLU #include <GL3/gl3.h>
#include <GL/glu.h> #else
#endif #include <GL/gl.h>
#endif
#ifndef GLFW_NO_GLU
#include <GL/glu.h>
#endif
#endif #endif

1
readme.html
View File

@ -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_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_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_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>windows</code> simple multi-window test program</li>
<li>Added <code>sharing</code> simple OpenGL object sharing 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> <li>Added a parameter to <code>glfwOpenWindow</code> for specifying a context the new window's context will share objects with</li>