diff options
| author | sfan5 <sfan5@live.de> | 2022-02-26 15:16:38 +0100 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2022-03-09 22:37:34 +0100 |
| commit | ad7c72c1648a710c2d091993c9249bd3d2b607a5 (patch) | |
| tree | c49d8d2f60d3754472fd21c17111f79b5b3fb40a /src | |
| parent | 51294163bbe39ca8b4a4620af724c9402f374142 (diff) | |
| download | minetest-ad7c72c1648a710c2d091993c9249bd3d2b607a5.tar.gz minetest-ad7c72c1648a710c2d091993c9249bd3d2b607a5.tar.bz2 minetest-ad7c72c1648a710c2d091993c9249bd3d2b607a5.zip | |
Remove direct OpenGL(ES) dependency
IrrlichtMt now provides this for us (see last commit)
fixes #12041
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 57baf20bd..1d6177ba3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -98,8 +98,8 @@ if(BUILD_CLIENT AND ENABLE_SOUND) endif() endif() - -option(ENABLE_GLES "Use OpenGL ES instead of OpenGL" FALSE) +# TODO: this should be removed one day, we can enable it unconditionally +option(ENABLE_GLES "Enable extra support code for OpenGL ES" FALSE) mark_as_advanced(ENABLE_GLES) option(ENABLE_TOUCH "Enable Touchscreen support" FALSE) @@ -108,21 +108,6 @@ if(ENABLE_TOUCH) endif() if(BUILD_CLIENT) - # transitive dependency from Irrlicht (see longer explanation below) - if(NOT WIN32) - if(ENABLE_GLES) - find_package(OpenGLES2 REQUIRED) - else() - set(OPENGL_GL_PREFERENCE "LEGACY" CACHE STRING - "See CMake Policy CMP0072 for reference. GLVND is broken on some nvidia setups") - set(OpenGL_GL_PREFERENCE ${OPENGL_GL_PREFERENCE}) - - find_package(OpenGL REQUIRED) - endif() - endif() -endif() - -if(BUILD_CLIENT) find_package(Freetype REQUIRED) endif() @@ -544,18 +529,6 @@ if(BUILD_CLIENT) ) endif() - if(ENABLE_GLES) - target_link_libraries( - ${PROJECT_NAME} - ${OPENGLES2_LIBRARIES} - ${EGL_LIBRARIES} - ) - else() - target_link_libraries( - ${PROJECT_NAME} - ${OPENGL_LIBRARIES} - ) - endif() if(USE_GETTEXT) target_link_libraries( ${PROJECT_NAME} |