caio/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-08-19 23:25:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Renamed GLFW_NO_GLU to GLFW_INCLUDE_GLU.

Browse Source
This commit is contained in:
Camilla Berglund
2012-06-05 23:55:10 +02:00
parent bf42c3cfbc
commit 2213450840
9 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/GL/glfw3.h
View File

@@ -146,11 +146,7 @@ extern "C" {
/* -------------------- END SYSTEM/COMPILER SPECIFIC --------------------- */
/* Include standard OpenGL headers: GLFW uses GL_FALSE/GL_TRUE, and it is
* convenient for the user to only have to include <GL/glfw.h>. This also
* solves the problem with Windows <GL/gl.h> and <GL/glu.h> needing some
* special defines which normally requires the user to include <windows.h>
* (which is not a nice solution for portable programs).
/* Include the chosen OpenGL header and, optionally, the GLU header.
*/
#if defined(__APPLE_CC__)
#if defined(GLFW_INCLUDE_GL3)
@@ -159,7 +155,7 @@ extern "C" {
#define GL_GLEXT_LEGACY
#include <OpenGL/gl.h>
#endif
#ifndef GLFW_NO_GLU
#if defined(GLFW_INCLUDE_GLU)
#include <OpenGL/glu.h>
#endif
#else
@@ -168,7 +164,7 @@ extern "C" {
#else
#include <GL/gl.h>
#endif
#ifndef GLFW_NO_GLU
#if defined(GLFW_INCLUDE_GLU)
#include <GL/glu.h>
#endif
#endif