From 378c75d153a19780f7c091c535791a1a971618df Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Wed, 13 Mar 2013 20:44:00 +0100 Subject: [PATCH] Added GLFW_INCLUDE_NONE. --- README.md | 4 ++++ include/GL/glfw3.h | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 58bea7ff..76b650c2 100644 --- a/README.md +++ b/README.md @@ -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` 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 sense if you are using OpenGL. @@ -286,6 +288,8 @@ GLFW. instead of `GL/gl.h` * Added `GLFW_INCLUDE_ES2` macro for telling the GLFW header to use `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 window visibility * Added `GLFW_REPEAT` key action for repeated keys diff --git a/include/GL/glfw3.h b/include/GL/glfw3.h index 55b95cd3..d51dd5fe 100644 --- a/include/GL/glfw3.h +++ b/include/GL/glfw3.h @@ -172,7 +172,7 @@ extern "C" { #if defined(__APPLE_CC__) #if defined(GLFW_INCLUDE_GLCOREARB) #include - #else + #elif !defined(GLFW_INCLUDE_NONE) #define GL_GLEXT_LEGACY #include #endif @@ -188,7 +188,7 @@ extern "C" { #include #elif defined(GLFW_INCLUDE_ES3) #include - #else + #elif !defined(GLFW_INCLUDE_NONE) #include #endif #if defined(GLFW_INCLUDE_GLU)