1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-06 17:41:04 +00:00

Irrlicht: Use EGL over GLX (#15286)

This commit is contained in:
sfan5 2024-10-22 23:04:46 +02:00 committed by GitHub
parent d4daa9fd40
commit aa273119f2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 128 additions and 548 deletions

View file

@ -158,7 +158,7 @@ if(ENABLE_OPENGL)
if(DEVICE STREQUAL "WINDOWS")
add_definitions(-D_IRR_COMPILE_WITH_WGL_MANAGER_)
elseif(DEVICE STREQUAL "X11")
add_definitions(-D_IRR_COMPILE_WITH_GLX_MANAGER_)
add_definitions(-D_IRR_COMPILE_WITH_EGL_MANAGER_)
elseif(DEVICE STREQUAL "OSX")
add_definitions(-D_IRR_COMPILE_WITH_NSOGL_MANAGER_)
endif()
@ -213,7 +213,15 @@ if(ENABLE_GLES2)
find_package(OpenGLES2 REQUIRED)
endif()
if(ENABLE_OPENGL)
find_package(OpenGL REQUIRED)
if(DEVICE STREQUAL "X11")
# use components so we can grab EGL
find_package(OpenGL REQUIRED COMPONENTS EGL OpenGL)
set(OPENGL_LIBRARIES OpenGL::GL)
set(EGL_INCLUDE_DIR OpenGL::EGL)
set(EGL_LIBRARY OpenGL::EGL)
else()
find_package(OpenGL REQUIRED)
endif()
endif()
if(USE_SDL2)
if(NOT ANDROID)
@ -330,7 +338,6 @@ target_link_libraries(IRROBJ PRIVATE IRRMESHOBJ)
set(IRRDRVROBJ
CNullDriver.cpp
CGLXManager.cpp
CWGLManager.cpp
CEGLManager.cpp
CSDLManager.cpp