Fix compiling on Debian 10 and remove GLES1 support on Linux.
It seems Debian10 dropped support for GLES1. So with my only test-platform gone, I'll disable it by default for all Linux platforms. It's still enabled in Android (for now). Thought in the long run no one should use GLES1 anymore anyway. git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5893 dfc29bdd-3216-0410-991c-e03cc46cb475master
parent
6ee00a39fd
commit
d5e0914d30
|
@ -227,6 +227,14 @@ define out. */
|
|||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
// Debian 10 removed support for GLES1 in mesa.
|
||||
// Can't tell about other Linux platforms or a way to test if it's still available,
|
||||
// so removing OGLES1 support on Linux now to allow compiling to work by default.
|
||||
#if defined(_IRR_LINUX_PLATFORM_) && !defined(_IRR_ANDROID_PLATFORM_)
|
||||
#define NO_IRR_COMPILE_WITH_OGLES1_
|
||||
#endif
|
||||
|
||||
//! Define _IRR_COMPILE_WITH_OGLES1_ to compile the Irrlicht engine with OpenGL ES 1.1.
|
||||
/** If you do not wish the engine to be compiled with OpenGL ES 1.1, comment this
|
||||
define out. */
|
||||
|
|
|
@ -9,11 +9,7 @@
|
|||
|
||||
#ifdef _IRR_COMPILE_WITH_EGL_MANAGER_
|
||||
|
||||
#if defined(_IRR_COMPILE_WITH_ANDROID_DEVICE_) || defined(_IRR_COMPILE_WITH_FB_DEVICE_) || defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_) || defined(__EMSCRIPTEN__)
|
||||
#include <EGL/egl.h>
|
||||
#else
|
||||
#include <GLES/egl.h>
|
||||
#endif
|
||||
|
||||
#include "SIrrCreationParameters.h"
|
||||
#include "SExposedVideoData.h"
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#include <GLES/glext.h>
|
||||
#include <EGL/eglplatform.h>
|
||||
#else
|
||||
#include <GLES/gl.h>
|
||||
#include <khronos-api/GLES/gl.h>
|
||||
#include <EGL/eglplatform.h>
|
||||
typedef char GLchar;
|
||||
#if defined(_IRR_OGLES1_USE_EXTPOINTER_)
|
||||
|
|
Loading…
Reference in New Issue