mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 04:54:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added GLFW_INCLUDE_GLEXT for glext.h inclusion.

Browse Source 
Closes #365.
This commit is contained in:
Camilla Berglund 2014-10-13 23:56:03 +02:00
parent 6a3779d635
commit b140606a49
5 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/build.dox
View File

@ -85,9 +85,14 @@ header. This is useful in combination with an extension loading library.
If none of the above inclusion macros are defined, the standard OpenGL `GL/gl.h` If none of the above inclusion macros are defined, the standard OpenGL `GL/gl.h`
header (`OpenGL/gl.h` on OS X) is included. header (`OpenGL/gl.h` on OS X) is included.
`GLFW_INCLUDE_GLEXT` makes the GLFW header include the appropriate extension
header for the OpenGL or OpenGL ES header selected above after and _in addition
to_ that header.
`GLFW_INCLUDE_GLU` makes the header include the GLU header _in addition to_ the `GLFW_INCLUDE_GLU` makes the header include the GLU header _in addition to_ the
header selected above. This should only be used with legacy code. GLU has been header selected above. This should only be used with the standard OpenGL header
deprecated and should not be used in new code. and only for legacy code. GLU has been deprecated and should not be used in new
code.
@note GLFW does not provide any of the API headers mentioned above. They must @note GLFW does not provide any of the API headers mentioned above. They must
be provided by your development environment or your OpenGL or OpenGL ES SDK. be provided by your development environment or your OpenGL or OpenGL ES SDK.

22
include/GLFW/glfw3.h
View File

@ -146,8 +146,13 @@ extern "C" {
#if defined(__APPLE_CC__) #if defined(__APPLE_CC__)
#if defined(GLFW_INCLUDE_GLCOREARB) #if defined(GLFW_INCLUDE_GLCOREARB)
#include <OpenGL/gl3.h> #include <OpenGL/gl3.h>
#if defined(GLFW_INCLUDE_GLEXT)
#include <OpenGL/gl3ext.h>
#endif
#elif !defined(GLFW_INCLUDE_NONE) #elif !defined(GLFW_INCLUDE_NONE)
#define GL_GLEXT_LEGACY #if !defined(GLFW_INCLUDE_GLEXT)
#define GL_GLEXT_LEGACY
#endif
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#endif #endif
#if defined(GLFW_INCLUDE_GLU) #if defined(GLFW_INCLUDE_GLU)
@ -158,14 +163,29 @@ extern "C" {
#include <GL/glcorearb.h> #include <GL/glcorearb.h>
#elif defined(GLFW_INCLUDE_ES1) #elif defined(GLFW_INCLUDE_ES1)
#include <GLES/gl.h> #include <GLES/gl.h>
#if defined(GLFW_INCLUDE_GLEXT)
#include <GLES/glext.h>
#endif
#elif defined(GLFW_INCLUDE_ES2) #elif defined(GLFW_INCLUDE_ES2)
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#if defined(GLFW_INCLUDE_GLEXT)
#include <GLES2/gl2ext.h>
#endif
#elif defined(GLFW_INCLUDE_ES3) #elif defined(GLFW_INCLUDE_ES3)
#include <GLES3/gl3.h> #include <GLES3/gl3.h>
#if defined(GLFW_INCLUDE_GLEXT)
#include <GLES3/gl2ext.h>
#endif
#elif defined(GLFW_INCLUDE_ES31) #elif defined(GLFW_INCLUDE_ES31)
#include <GLES3/gl31.h> #include <GLES3/gl31.h>
#if defined(GLFW_INCLUDE_GLEXT)
#include <GLES3/gl2ext.h>
#endif
#elif !defined(GLFW_INCLUDE_NONE) #elif !defined(GLFW_INCLUDE_NONE)
#include <GL/gl.h> #include <GL/gl.h>
#if defined(GLFW_INCLUDE_GLEXT)
#include <GL/glext.h>
#endif
#endif #endif
#if defined(GLFW_INCLUDE_GLU) #if defined(GLFW_INCLUDE_GLU)
#include <GL/glu.h> #include <GL/glu.h>

2
tests/defaults.c
View File

@ -29,8 +29,8 @@
// //
//======================================================================== //========================================================================
#define GLFW_INCLUDE_GLEXT
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#include <GL/glext.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

2
tests/fsaa.c
View File

@ -29,8 +29,8 @@
// //
//======================================================================== //========================================================================
#define GLFW_INCLUDE_GLEXT
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#include <GL/glext.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

2
tests/glfwinfo.c
View File

@ -29,8 +29,8 @@
// //
//======================================================================== //========================================================================
#define GLFW_INCLUDE_GLEXT
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#include <GL/glext.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>