Skip to content

Commit 785f68e

Browse files
authoredSep 22, 2018
Make OpenGL preference configurable, default to LEGACY (#7666)
This partially reverts 1ec5028 Add option OPENGL_GL_PREFERENCE
1 parent 79e393c commit 785f68e

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed
 

Diff for: ‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ General options and their default values:
212212
ENABLE_LUAJIT=ON - Build with LuaJIT (much faster than non-JIT Lua)
213213
ENABLE_SYSTEM_GMP=ON - Use GMP from system (much faster than bundled mini-gmp)
214214
ENABLE_SYSTEM_JSONCPP=OFF - Use JsonCPP from system
215+
OPENGL_GL_PREFERENCE=LEGACY - Linux client build only; See CMake Policy CMP0072 for reference
215216
RUN_IN_PLACE=FALSE - Create a portable install (worlds, settings etc. in current directory)
216217
USE_GPROF=FALSE - Enable profiling using GProf
217218
VERSION_EXTRA= - Text to append to version (e.g. VERSION_EXTRA=foobar -> Minetest 0.4.9-foobar)

Diff for: ‎src/CMakeLists.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,11 @@ else()
296296
if(NOT HAIKU)
297297
find_package(X11 REQUIRED)
298298
endif(NOT HAIKU)
299-
set(OpenGL_GL_PREFERENCE "GLVND")
299+
300+
set(OPENGL_GL_PREFERENCE "LEGACY" CACHE STRING
301+
"See CMake Policy CMP0072 for reference. GLVND is broken on some nvidia setups")
302+
set(OpenGL_GL_PREFERENCE ${OPENGL_GL_PREFERENCE})
303+
300304
find_package(OpenGL REQUIRED)
301305
find_package(JPEG REQUIRED)
302306
find_package(BZip2 REQUIRED)

0 commit comments

Comments
 (0)
Please sign in to comment.