Make it possible again to enable ES1 on Linux.

Seems Debian 11 adds it back.
Thanks @TheBrokenRail for patch.
Hidden in comments for patch #322: https://sourceforge.net/p/irrlicht/patches/322

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6175 dfc29bdd-3216-0410-991c-e03cc46cb475

diff --git a/include/IrrCompileConfig.h b/include/IrrCompileConfig.h
index e27156d2d5e30b565f240a7d78d06950b396bc39..341b09ad8db2c23ec5f8d7b5cd94372d601768fd 100644 (file)
--- a/include/IrrCompileConfig.h
+++ b/include/IrrCompileConfig.h
@@ -227,22 +227,24 @@ define out. */
        #endif\r
 #endif\r
 \r
-\r
-// Debian 10 removed support for GLES1 in mesa.\r
-// Can't tell about other Linux platforms or a way to test if it's still available,\r
-// so removing OGLES1 support on Linux now to allow compiling to work by default.\r
-#if defined(_IRR_LINUX_PLATFORM_) && !defined(_IRR_ANDROID_PLATFORM_)\r
-#define NO_IRR_COMPILE_WITH_OGLES1_\r
-#endif\r
-\r
 //! Define _IRR_COMPILE_WITH_OGLES1_ to compile the Irrlicht engine with OpenGL ES 1.1.\r
 /** If you do not wish the engine to be compiled with OpenGL ES 1.1, comment this\r
-define out. */\r
+define out.\r
+Currently only enabled on Android by default.\r
+Depending on platform you may have to enable _IRR_OGLES1_USE_KHRONOS_API_HEADERS_ as well when using it.\r
+*/\r
+#if defined(_IRR_ANDROID_PLATFORM_)\r
 #define _IRR_COMPILE_WITH_OGLES1_\r
+#endif\r
 #ifdef NO_IRR_COMPILE_WITH_OGLES1_\r
 #undef _IRR_COMPILE_WITH_OGLES1_\r
 #endif\r
 \r
+#ifdef _IRR_COMPILE_WITH_OGLES1_\r
+//! Define _IRR_OGLES1_USE_KHRONOS_API_HEADERS_ to use the OpenGL ES headers from the Debian Khronos-api package\r
+//#define _IRR_OGLES1_USE_KHRONOS_API_HEADERS_\r
+#endif\r
+\r
 //! Define required options for OpenGL ES 1.1 drivers.\r
 #if defined(_IRR_COMPILE_WITH_OGLES1_)\r
 #if defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_) || defined(_IRR_COMPILE_WITH_X11_DEVICE_) || defined(_IRR_COMPILE_WITH_ANDROID_DEVICE_)\r

diff --git a/source/Irrlicht/COGLESCommon.h b/source/Irrlicht/COGLESCommon.h
index c7988f7a7bc17e497f21d5120a1d471ff4f78dbb..7086522ffc173de013d6e5729bd514d45ca6975c 100644 (file)
--- a/source/Irrlicht/COGLESCommon.h
+++ b/source/Irrlicht/COGLESCommon.h
@@ -12,14 +12,14 @@
 #if defined(_IRR_COMPILE_WITH_IOS_DEVICE_)\r
 #include <OpenGLES/ES1/gl.h>\r
 #include <OpenGLES/ES1/glext.h>\r
-#elif defined(_IRR_COMPILE_WITH_ANDROID_DEVICE_)\r
-#include <GLES/gl.h>\r
-#include <GLES/glext.h>\r
-#include <EGL/eglplatform.h>\r
-#else\r
+#elif defined(_IRR_OGLES1_USE_KHRONOS_API_HEADERS_)\r
 #include <khronos-api/GLES/gl.h>\r
 #include <EGL/eglplatform.h>\r
 typedef char GLchar;\r
+#else  // or only when defined(_IRR_COMPILE_WITH_ANDROID_DEVICE_) ?\r
+#include <GLES/gl.h>\r
+#include <GLES/glext.h>\r
+#include <EGL/eglplatform.h>\r
 #if defined(_IRR_OGLES1_USE_EXTPOINTER_)\r
 #include "gles-ext.h"\r
 #endif\r