diff --git a/android/Android.mk b/android/Android.mk index 5dd78cc8a..56d99f22e 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -245,7 +245,7 @@ LOCAL_CPP_FEATURES += rtti exceptions LOCAL_SRC_FILES := $(wildcard ../src/*.cpp) \ $(wildcard ../src/*/*.cpp) \ $(wildcard ../src/*/*/*.cpp) -LOCAL_LDLIBS := -llog -landroid -lEGL -lGLESv1_CM -lGLESv3 -lOpenSLES -ldl -lm +LOCAL_LDLIBS := -llog -landroid -lGLESv1_CM -lGLESv3 -lOpenSLES -ldl -lm LOCAL_CFLAGS := -I../lib/angelscript/include \ -I../lib/bullet/src \ -I../lib/libraqm \ diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt index 620e776f3..b167de216 100644 --- a/lib/irrlicht/CMakeLists.txt +++ b/lib/irrlicht/CMakeLists.txt @@ -13,19 +13,6 @@ if(NOT SERVER_ONLY) find_package(OpenGL REQUIRED) include_directories(${OPENGL_INCLUDE_DIR}) endif() - - if(NOT APPLE AND USE_GLES2) - find_package(EGL) - - if(EGL_FOUND) - include_directories(${EGL_INCLUDE_DIR}) - else() - if(USE_GLES2 AND NOT APPLE) - message(FATAL_ERROR "EGL not found.") - endif() - endif() - endif() - else() include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/" "${CMAKE_CURRENT_SOURCE_DIR}/../../src") @@ -83,7 +70,6 @@ source/Irrlicht/CAttributes.cpp source/Irrlicht/CBillboardSceneNode.cpp source/Irrlicht/CBoneSceneNode.cpp source/Irrlicht/CCameraSceneNode.cpp -source/Irrlicht/CContextEGL.cpp source/Irrlicht/CColorConverter.cpp source/Irrlicht/CCubeSceneNode.cpp source/Irrlicht/CDefaultGUIElementFactory.cpp @@ -213,7 +199,6 @@ source/Irrlicht/CBillboardSceneNode.h source/Irrlicht/CBlit.h source/Irrlicht/CBoneSceneNode.h source/Irrlicht/CCameraSceneNode.h -source/Irrlicht/CContextEGL.h source/Irrlicht/CColorConverter.h source/Irrlicht/CCubeSceneNode.h source/Irrlicht/CDefaultGUIElementFactory.h @@ -551,9 +536,6 @@ target_link_libraries(stkirrlicht ${ZLIB_LIBRARY}) if(NOT SERVER_ONLY) target_link_libraries(stkirrlicht ${PNG_LIBRARY} ${JPEG_LIBRARY}) - if(NOT APPLE AND USE_GLES2) - target_link_libraries(stkirrlicht ${EGL_LIBRARY}) - endif() endif() if(WIN32) diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp index bda4fc32f..0764666ee 100644 --- a/src/graphics/glwrap.cpp +++ b/src/graphics/glwrap.cpp @@ -41,6 +41,7 @@ #if defined(USE_GLES2) #ifndef __APPLE__ +#include #include #include #endif @@ -195,7 +196,7 @@ void initGL() } #else #ifdef ARB_DEBUG_OUTPUT - glDebugMessageCallbackARB = (PFNGLDEBUGMESSAGECALLBACKKHRPROC)eglGetProcAddress("glDebugMessageCallbackKHR"); + glDebugMessageCallbackARB = (PFNGLDEBUGMESSAGECALLBACKKHRPROC)SDL_GL_GetProcAddress("glDebugMessageCallbackKHR"); #endif #endif @@ -210,9 +211,9 @@ void initGL() #ifndef IOS_STK #ifdef USE_GLES2 glDebugMessageControl = (void(GL_APIENTRY*)(GLenum, GLenum, GLenum, GLsizei, - const GLuint*, GLboolean))eglGetProcAddress("glDebugMessageControlKHR"); + const GLuint*, GLboolean))SDL_GL_GetProcAddress("glDebugMessageControlKHR"); glDebugMessageInsert = (void(GL_APIENTRY*)(GLenum, GLenum, GLuint, GLenum, - GLsizei, const char*))eglGetProcAddress("glDebugMessageInsertKHR"); + GLsizei, const char*))SDL_GL_GetProcAddress("glDebugMessageInsertKHR"); assert(glDebugMessageControl && glDebugMessageInsert); #endif glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, NULL, GL_TRUE);