mirror of
https://github.com/minetest/minetest.git
synced 2024-08-19 04:54:18 +02:00
Fix breakage of non-GLES2 setups (#8774)
The commit 526a9e4b66abaf83eb6b1aaa3e93375acd87b830 breaks the non-GLES2 setups because the code that is intended to handle that is behind "elseif()" which is interpreted as "elseif(false)" and thus the code never gets executed. Fix that by changing the offending line to else(). Additionally, to avoid breaking the server only build (which shall not have a dependency on GL/GLU/GLES at all), enclose the entire block code in if(BUILD_CLIENT).
This commit is contained in:
parent
120155f312
commit
49f1006183
@ -104,15 +104,17 @@ endif()
|
||||
|
||||
option(ENABLE_GLES "Use OpenGL ES instead of OpenGL" FALSE)
|
||||
mark_as_advanced(ENABLE_GLES)
|
||||
if(ENABLE_GLES)
|
||||
find_package(OpenGLES2 REQUIRED)
|
||||
elseif()
|
||||
if(NOT WIN32) # Unix probably
|
||||
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})
|
||||
if(BUILD_CLIENT)
|
||||
if(ENABLE_GLES)
|
||||
find_package(OpenGLES2 REQUIRED)
|
||||
else()
|
||||
if(NOT WIN32) # Unix probably
|
||||
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)
|
||||
find_package(OpenGL REQUIRED)
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user