ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove EGL linking dependency

Browse Source
This commit is contained in:
Benau 2020-07-12 11:00:53 +08:00
parent f202bcd48c
commit cef6eb0558
3 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/Android.mk
View File

@ -245,7 +245,7 @@ LOCAL_CPP_FEATURES += rtti exceptions
LOCAL_SRC_FILES := $(wildcard ../src/*.cpp) \ LOCAL_SRC_FILES := $(wildcard ../src/*.cpp) \
$(wildcard ../src/*/*.cpp) \ $(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 \ LOCAL_CFLAGS := -I../lib/angelscript/include \
-I../lib/bullet/src \ -I../lib/bullet/src \
-I../lib/libraqm \ -I../lib/libraqm \

18
lib/irrlicht/CMakeLists.txt
View File

@ -13,19 +13,6 @@ if(NOT SERVER_ONLY)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
include_directories(${OPENGL_INCLUDE_DIR}) include_directories(${OPENGL_INCLUDE_DIR})
endif() 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() else()
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/" include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/"
"${CMAKE_CURRENT_SOURCE_DIR}/../../src") "${CMAKE_CURRENT_SOURCE_DIR}/../../src")
@ -83,7 +70,6 @@ source/Irrlicht/CAttributes.cpp
source/Irrlicht/CBillboardSceneNode.cpp source/Irrlicht/CBillboardSceneNode.cpp
source/Irrlicht/CBoneSceneNode.cpp source/Irrlicht/CBoneSceneNode.cpp
source/Irrlicht/CCameraSceneNode.cpp source/Irrlicht/CCameraSceneNode.cpp
source/Irrlicht/CContextEGL.cpp
source/Irrlicht/CColorConverter.cpp source/Irrlicht/CColorConverter.cpp
source/Irrlicht/CCubeSceneNode.cpp source/Irrlicht/CCubeSceneNode.cpp
source/Irrlicht/CDefaultGUIElementFactory.cpp source/Irrlicht/CDefaultGUIElementFactory.cpp
@ -213,7 +199,6 @@ source/Irrlicht/CBillboardSceneNode.h
source/Irrlicht/CBlit.h source/Irrlicht/CBlit.h
source/Irrlicht/CBoneSceneNode.h source/Irrlicht/CBoneSceneNode.h
source/Irrlicht/CCameraSceneNode.h source/Irrlicht/CCameraSceneNode.h
source/Irrlicht/CContextEGL.h
source/Irrlicht/CColorConverter.h source/Irrlicht/CColorConverter.h
source/Irrlicht/CCubeSceneNode.h source/Irrlicht/CCubeSceneNode.h
source/Irrlicht/CDefaultGUIElementFactory.h source/Irrlicht/CDefaultGUIElementFactory.h
@ -551,9 +536,6 @@ target_link_libraries(stkirrlicht ${ZLIB_LIBRARY})
if(NOT SERVER_ONLY) if(NOT SERVER_ONLY)
target_link_libraries(stkirrlicht ${PNG_LIBRARY} ${JPEG_LIBRARY}) target_link_libraries(stkirrlicht ${PNG_LIBRARY} ${JPEG_LIBRARY})
if(NOT APPLE AND USE_GLES2)
target_link_libraries(stkirrlicht ${EGL_LIBRARY})
endif()
endif() endif()
if(WIN32) if(WIN32)

7
src/graphics/glwrap.cpp
View File

@ -41,6 +41,7 @@
#if defined(USE_GLES2) #if defined(USE_GLES2)
#ifndef __APPLE__ #ifndef __APPLE__
#include <SDL_video.h>
#include <EGL/egl.h> #include <EGL/egl.h>
#include <EGL/eglext.h> #include <EGL/eglext.h>
#endif #endif
@ -195,7 +196,7 @@ void initGL()
} }
#else #else
#ifdef ARB_DEBUG_OUTPUT #ifdef ARB_DEBUG_OUTPUT
glDebugMessageCallbackARB = (PFNGLDEBUGMESSAGECALLBACKKHRPROC)eglGetProcAddress("glDebugMessageCallbackKHR"); glDebugMessageCallbackARB = (PFNGLDEBUGMESSAGECALLBACKKHRPROC)SDL_GL_GetProcAddress("glDebugMessageCallbackKHR");
#endif #endif
#endif #endif
@ -210,9 +211,9 @@ void initGL()
#ifndef IOS_STK #ifndef IOS_STK
#ifdef USE_GLES2 #ifdef USE_GLES2
glDebugMessageControl = (void(GL_APIENTRY*)(GLenum, GLenum, GLenum, GLsizei, 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, glDebugMessageInsert = (void(GL_APIENTRY*)(GLenum, GLenum, GLuint, GLenum,
GLsizei, const char*))eglGetProcAddress("glDebugMessageInsertKHR"); GLsizei, const char*))SDL_GL_GetProcAddress("glDebugMessageInsertKHR");
assert(glDebugMessageControl && glDebugMessageInsert); assert(glDebugMessageControl && glDebugMessageInsert);
#endif #endif
glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, NULL, GL_TRUE); glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, NULL, GL_TRUE);