Fix GLU header inclusion being disabled

From upstream: https://github.com/glfw/glfw/commit/81f475bccbc0e784e8327005f2e66e3546fe8da0.
2020-06-21 18:07:31 +02:00
parent 2c6e5a6e73
commit 0a892b72e6
1 changed files with 16 additions and 6 deletions
@@ -195,6 +195,22 @@ extern "C" {

 #endif /*__APPLE__*/

+#elif defined(GLFW_INCLUDE_GLU)
+
+ #if defined(__APPLE__)
+
+  #if defined(GLFW_INCLUDE_GLU)
+   #include <OpenGL/glu.h>
+  #endif
+
+ #else /*__APPLE__*/
+
+  #if defined(GLFW_INCLUDE_GLU)
+   #include <GL/glu.h>
+  #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 <OpenGL/gl.h>
-  #if defined(GLFW_INCLUDE_GLU)
-   #include <OpenGL/glu.h>
-  #endif

 #else /*__APPLE__*/

@@ -228,9 +241,6 @@ extern "C" {
  #if defined(GLFW_INCLUDE_GLEXT)
   #include <GL/glext.h>
  #endif
-  #if defined(GLFW_INCLUDE_GLU)
-   #include <GL/glu.h>
-  #endif

 #endif /*__APPLE__*/