From f28e442bfa705f746bfb7bd995d1958c802cb6a3 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Tue, 16 Jan 2024 21:01:36 +0100 Subject: [PATCH] Drop all !_IRR_OGLES2_USE_EXTPOINTER_ code --- source/Irrlicht/CMakeLists.txt | 3 +-- source/Irrlicht/COGLES2Common.h | 8 ++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/source/Irrlicht/CMakeLists.txt b/source/Irrlicht/CMakeLists.txt index ab14b8f2..cca3c8b9 100644 --- a/source/Irrlicht/CMakeLists.txt +++ b/source/Irrlicht/CMakeLists.txt @@ -218,9 +218,8 @@ if(ENABLE_GLES2) add_definitions(-D_IRR_COMPILE_WITH_OGLES2_) set(OPENGLES2_DIRECT_LINK TRUE) # not yet possible to remove this 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") - add_definitions(-D_IRR_OGLES2_USE_EXTPOINTER_) set(USE_SDLGL ON) set(USE_SDLGLES2 ON) endif() diff --git a/source/Irrlicht/COGLES2Common.h b/source/Irrlicht/COGLES2Common.h index 404cce7f..33aa8a59 100644 --- a/source/Irrlicht/COGLES2Common.h +++ b/source/Irrlicht/COGLES2Common.h @@ -18,17 +18,13 @@ #include #include #else -#if defined(_IRR_OGLES2_USE_EXTPOINTER_) - #define GL_GLEXT_PROTOTYPES 1 - #define GLX_GLXEXT_PROTOTYPES 1 -#endif +#define GL_GLEXT_PROTOTYPES 1 +#define GLX_GLXEXT_PROTOTYPES 1 #include #include typedef char GLchar; -#if defined(_IRR_OGLES2_USE_EXTPOINTER_) #include #endif -#endif #ifndef GL_BGRA #define GL_BGRA 0x80E1;