BRNSystems/irrlicht
1
0
Fork 0
forked from Mirrorlandia_minetest/irrlicht
Code Pull Requests Activity

Drop all !_IRR_OGLES2_USE_EXTPOINTER_ code

Browse Source
This commit is contained in:
sfan5 2024-01-16 21:01:36 +01:00
parent 4cd5c3489e
commit f28e442bfa
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/Irrlicht/CMakeLists.txt
View File

@ -218,9 +218,8 @@ if(ENABLE_GLES2)
add_definitions(-D_IRR_COMPILE_WITH_OGLES2_) add_definitions(-D_IRR_COMPILE_WITH_OGLES2_)
set(OPENGLES2_DIRECT_LINK TRUE) # not yet possible to remove this set(OPENGLES2_DIRECT_LINK TRUE) # not yet possible to remove this
if(DEVICE MATCHES "^(WINDOWS|X11|ANDROID)$" OR EMSCRIPTEN) if(DEVICE MATCHES "^(WINDOWS|X11|ANDROID)$" OR EMSCRIPTEN)
add_definitions(-D_IRR_COMPILE_WITH_EGL_MANAGER_ -D_IRR_OGLES2_USE_EXTPOINTER_) add_definitions(-D_IRR_COMPILE_WITH_EGL_MANAGER_)
elseif(DEVICE STREQUAL "SDL") elseif(DEVICE STREQUAL "SDL")
add_definitions(-D_IRR_OGLES2_USE_EXTPOINTER_)
set(USE_SDLGL ON) set(USE_SDLGL ON)
set(USE_SDLGLES2 ON) set(USE_SDLGLES2 ON)
endif() endif()

8
source/Irrlicht/COGLES2Common.h
View File

@ -18,17 +18,13 @@
#include <GLES2/gl2ext.h> #include <GLES2/gl2ext.h>
#include <EGL/eglplatform.h> #include <EGL/eglplatform.h>
#else #else
#if defined(_IRR_OGLES2_USE_EXTPOINTER_) #define GL_GLEXT_PROTOTYPES 1
#define GL_GLEXT_PROTOTYPES 1 #define GLX_GLXEXT_PROTOTYPES 1
#define GLX_GLXEXT_PROTOTYPES 1
#endif
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <EGL/eglplatform.h> #include <EGL/eglplatform.h>
typedef char GLchar; typedef char GLchar;
#if defined(_IRR_OGLES2_USE_EXTPOINTER_)
#include <GLES2/gl2ext.h> #include <GLES2/gl2ext.h>
#endif #endif
#endif
#ifndef GL_BGRA #ifndef GL_BGRA
#define GL_BGRA 0x80E1; #define GL_BGRA 0x80E1;