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

Added GLFW_INCLUDE_NONE.

Browse Source
This commit is contained in:
Camilla Berglund 2013-03-13 20:44:00 +01:00
parent 39fe1f1ea6
commit 378c75d153
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -136,6 +136,8 @@ header instead of the regular OpenGL header.
`GLFW_INCLUDE_ES3` makes the header include the OpenGL ES 3.0 `GLES3/gl3.h` `GLFW_INCLUDE_ES3` makes the header include the OpenGL ES 3.0 `GLES3/gl3.h`
header instead of the regular OpenGL header. header instead of the regular OpenGL header.
`GLFW_INCLUDE_NONE` makes the header not include any client API header.
`GLFW_INCLUDE_GLU` makes the header include the GLU header. This only makes `GLFW_INCLUDE_GLU` makes the header include the GLU header. This only makes
sense if you are using OpenGL. sense if you are using OpenGL.
@ -286,6 +288,8 @@ GLFW.
instead of `GL/gl.h` instead of `GL/gl.h`
* Added `GLFW_INCLUDE_ES2` macro for telling the GLFW header to use * Added `GLFW_INCLUDE_ES2` macro for telling the GLFW header to use
`GLES2/gl2.h` instead of `GL/gl.h` `GLES2/gl2.h` instead of `GL/gl.h`
* Added `GLFW_INCLUDE_NONE` macro for telling the GLFW header to not include
any client API header
* Added `GLFW_VISIBLE` window hint and parameter for controlling and polling * Added `GLFW_VISIBLE` window hint and parameter for controlling and polling
window visibility window visibility
* Added `GLFW_REPEAT` key action for repeated keys * Added `GLFW_REPEAT` key action for repeated keys

4
include/GL/glfw3.h
View File

@ -172,7 +172,7 @@ 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>
#else #elif !defined(GLFW_INCLUDE_NONE)
#define GL_GLEXT_LEGACY #define GL_GLEXT_LEGACY
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#endif #endif
@ -188,7 +188,7 @@ extern "C" {
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#elif defined(GLFW_INCLUDE_ES3) #elif defined(GLFW_INCLUDE_ES3)
#include <GLES3/gl3.h> #include <GLES3/gl3.h>
#else #elif !defined(GLFW_INCLUDE_NONE)
#include <GL/gl.h> #include <GL/gl.h>
#endif #endif
#if defined(GLFW_INCLUDE_GLU) #if defined(GLFW_INCLUDE_GLU)