From 22134508406c8cd6f3974aed326e7c667e6fa625 Mon Sep 17 00:00:00 2001
From: Camilla Berglund
Date: Tue, 5 Jun 2012 23:55:10 +0200
Subject: [PATCH] Renamed GLFW_NO_GLU to GLFW_INCLUDE_GLU.
---
examples/boing.c | 2 ++
examples/splitview.c | 2 ++
examples/triangle.c | 1 +
examples/wave.c | 2 ++
include/GL/glfw3.h | 10 +++-------
readme.html | 1 +
tests/accuracy.c | 1 +
tests/fsaa.c | 1 +
tests/sharing.c | 1 +
9 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/examples/boing.c b/examples/boing.c
index 33696e46..49d602ca 100644
--- a/examples/boing.c
+++ b/examples/boing.c
@@ -30,6 +30,8 @@
#include
#include
#include
+
+#define GLFW_INCLUDE_GLU
#include
diff --git a/examples/splitview.c b/examples/splitview.c
index 2cd43fdf..0f27d32e 100644
--- a/examples/splitview.c
+++ b/examples/splitview.c
@@ -10,7 +10,9 @@
// because I am not a friend of orthogonal projections)
//========================================================================
+#define GLFW_INCLUDE_GLU
#include
+
#include
#include
#include
diff --git a/examples/triangle.c b/examples/triangle.c
index e61ea9ab..0f6631d0 100644
--- a/examples/triangle.c
+++ b/examples/triangle.c
@@ -7,6 +7,7 @@
#include
#include
+#define GLFW_INCLUDE_GLU
#include
int main(void)
diff --git a/examples/wave.c b/examples/wave.c
index 8ecee51f..44bae584 100644
--- a/examples/wave.c
+++ b/examples/wave.c
@@ -11,6 +11,8 @@
#include
#include
#include
+
+#define GLFW_INCLUDE_GLU
#include
#ifndef M_PI
diff --git a/include/GL/glfw3.h b/include/GL/glfw3.h
index d3d48a33..c77561b1 100644
--- a/include/GL/glfw3.h
+++ b/include/GL/glfw3.h
@@ -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 . This also
- * solves the problem with Windows and needing some
- * special defines which normally requires the user to include
- * (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
#endif
- #ifndef GLFW_NO_GLU
+ #if defined(GLFW_INCLUDE_GLU)
#include
#endif
#else
@@ -168,7 +164,7 @@ extern "C" {
#else
#include
#endif
- #ifndef GLFW_NO_GLU
+ #if defined(GLFW_INCLUDE_GLU)
#include
#endif
#endif
diff --git a/readme.html b/readme.html
index fbc3e9d7..020e0802 100644
--- a/readme.html
+++ b/readme.html
@@ -298,6 +298,7 @@ version of GLFW.
Renamed GLFW_WINDOW_NO_RESIZE
to GLFW_WINDOW_RESIZABLE
Renamed GLFW_BUILD_DLL
to _GLFW_BUILD_DLL
Renamed version
test to glfwinfo
+ Renamed GLFW_NO_GLU
to GLFW_INCLUDE_GLU
and made it disabled by default
Replaced ad hoc build system with CMake
Replaced layout-dependent key codes with single, platform-independent set based on US layout
Replaced mouse wheel interface with two-dimensional, floating point scrolling interface
diff --git a/tests/accuracy.c b/tests/accuracy.c
index f235cf75..ae572987 100644
--- a/tests/accuracy.c
+++ b/tests/accuracy.c
@@ -29,6 +29,7 @@
//
//========================================================================
+#define GLFW_INCLUDE_GLU
#include
#include
diff --git a/tests/fsaa.c b/tests/fsaa.c
index 6cdb77e0..9c45ddcc 100644
--- a/tests/fsaa.c
+++ b/tests/fsaa.c
@@ -29,6 +29,7 @@
//
//========================================================================
+#define GLFW_INCLUDE_GLU
#include
#include
diff --git a/tests/sharing.c b/tests/sharing.c
index 7d774151..6f1df980 100644
--- a/tests/sharing.c
+++ b/tests/sharing.c
@@ -27,6 +27,7 @@
//
//========================================================================
+#define GLFW_INCLUDE_GLU
#include
#include