From 0a892b72e698f9e274c9ffc1bc0609c01b7d219b Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 21 Jun 2020 18:07:31 +0200 Subject: [PATCH] Fix GLU header inclusion being disabled From upstream: https://github.com/glfw/glfw/commit/81f475bccbc0e784e8327005f2e66e3546fe8da0. --- glfw/glfw3.h | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/glfw/glfw3.h b/glfw/glfw3.h index cd70e3f9f..8399d8b48 100644 --- a/glfw/glfw3.h +++ b/glfw/glfw3.h @@ -195,6 +195,22 @@ extern "C" { #endif /*__APPLE__*/ +#elif defined(GLFW_INCLUDE_GLU) + + #if defined(__APPLE__) + + #if defined(GLFW_INCLUDE_GLU) + #include + #endif + + #else /*__APPLE__*/ + + #if defined(GLFW_INCLUDE_GLU) + #include + #endif + + #endif /*__APPLE__*/ + #elif !defined(GLFW_INCLUDE_NONE) && \ !defined(__gl_h_) && \ !defined(__gles1_gl_h_) && \ @@ -218,9 +234,6 @@ extern "C" { #define GL_GLEXT_LEGACY #endif #include - #if defined(GLFW_INCLUDE_GLU) - #include - #endif #else /*__APPLE__*/ @@ -228,9 +241,6 @@ extern "C" { #if defined(GLFW_INCLUDE_GLEXT) #include #endif - #if defined(GLFW_INCLUDE_GLU) - #include - #endif #endif /*__APPLE__*/