mirror of
				https://github.com/luanti-org/luanti.git
				synced 2025-11-04 01:05:48 +01:00 
			
		
		
		
	Make OpenGL preference configurable, default to LEGACY (#7666)
This partially reverts 1ec5028
Add option OPENGL_GL_PREFERENCE
			
			
This commit is contained in:
		@@ -212,6 +212,7 @@ General options and their default values:
 | 
			
		||||
    ENABLE_LUAJIT=ON           - Build with LuaJIT (much faster than non-JIT Lua)
 | 
			
		||||
    ENABLE_SYSTEM_GMP=ON       - Use GMP from system (much faster than bundled mini-gmp)
 | 
			
		||||
    ENABLE_SYSTEM_JSONCPP=OFF  - Use JsonCPP from system
 | 
			
		||||
    OPENGL_GL_PREFERENCE=LEGACY - Linux client build only; See CMake Policy CMP0072 for reference
 | 
			
		||||
    RUN_IN_PLACE=FALSE         - Create a portable install (worlds, settings etc. in current directory)
 | 
			
		||||
    USE_GPROF=FALSE            - Enable profiling using GProf
 | 
			
		||||
    VERSION_EXTRA=             - Text to append to version (e.g. VERSION_EXTRA=foobar -> Minetest 0.4.9-foobar)
 | 
			
		||||
 
 | 
			
		||||
@@ -296,7 +296,11 @@ else()
 | 
			
		||||
		if(NOT HAIKU)
 | 
			
		||||
			find_package(X11 REQUIRED)
 | 
			
		||||
		endif(NOT HAIKU)
 | 
			
		||||
		set(OpenGL_GL_PREFERENCE "GLVND")
 | 
			
		||||
 | 
			
		||||
		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(JPEG REQUIRED)
 | 
			
		||||
		find_package(BZip2 REQUIRED)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user