From 244d6d782375f4277123e43c5dc2ede7d41aa4f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Tue, 16 May 2017 15:42:51 +0200 Subject: [PATCH] Allow OpenGL ES header inclusion on macOS Related to #985. --- include/GLFW/glfw3.h | 52 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/include/GLFW/glfw3.h b/include/GLFW/glfw3.h index 706fb958..f5802222 100644 --- a/include/GLFW/glfw3.h +++ b/include/GLFW/glfw3.h @@ -139,7 +139,32 @@ extern "C" { /* Include the chosen client API headers. */ -#if defined(__APPLE__) +#if defined(GLFW_INCLUDE_ES1) + #include + #if defined(GLFW_INCLUDE_GLEXT) + #include + #endif +#elif defined(GLFW_INCLUDE_ES2) + #include + #if defined(GLFW_INCLUDE_GLEXT) + #include + #endif +#elif defined(GLFW_INCLUDE_ES3) + #include + #if defined(GLFW_INCLUDE_GLEXT) + #include + #endif +#elif defined(GLFW_INCLUDE_ES31) + #include + #if defined(GLFW_INCLUDE_GLEXT) + #include + #endif +#elif defined(GLFW_INCLUDE_ES32) + #include + #if defined(GLFW_INCLUDE_GLEXT) + #include + #endif +#elif defined(__APPLE__) #if defined(GLFW_INCLUDE_GLCOREARB) #include #if defined(GLFW_INCLUDE_GLEXT) @@ -157,31 +182,6 @@ extern "C" { #else #if defined(GLFW_INCLUDE_GLCOREARB) #include - #elif defined(GLFW_INCLUDE_ES1) - #include - #if defined(GLFW_INCLUDE_GLEXT) - #include - #endif - #elif defined(GLFW_INCLUDE_ES2) - #include - #if defined(GLFW_INCLUDE_GLEXT) - #include - #endif - #elif defined(GLFW_INCLUDE_ES3) - #include - #if defined(GLFW_INCLUDE_GLEXT) - #include - #endif - #elif defined(GLFW_INCLUDE_ES31) - #include - #if defined(GLFW_INCLUDE_GLEXT) - #include - #endif - #elif defined(GLFW_INCLUDE_ES32) - #include - #if defined(GLFW_INCLUDE_GLEXT) - #include - #endif #elif !defined(GLFW_INCLUDE_NONE) #include #if defined(GLFW_INCLUDE_GLEXT)