test

source/Irrlicht/CMakeLists.txt

@@ -185,14 +185,31 @@ endif()
 
 if(ENABLE_OPENGL)
 	add_definitions(-D_IRR_COMPILE_WITH_OPENGL_)
-	set(OPENGL_DIRECT_LINK TRUE) # not yet possible to remove this
+	set(OPENGL_DIRECT_LINK TRUE) # driver relies on this
 	if(DEVICE STREQUAL "WINDOWS")
 		add_definitions(-D_IRR_COMPILE_WITH_WGL_MANAGER_)
 	elseif(DEVICE STREQUAL "X11")
 		add_definitions(-D_IRR_COMPILE_WITH_GLX_MANAGER_)
 	elseif(DEVICE STREQUAL "OSX")
 		add_definitions(-D_IRR_COMPILE_WITH_NSOGL_MANAGER_)
 	endif()
+
+	# the driver requires some GL 4.5 symbols to combine and sometimes the SDL
+	# headers are more out-of-date than the OS ones *facepalm*
+	if(DEVICE STREQUAL "SDL")
+		set(CMAKE_REQUIRED_INCLUDES ${SDL2_INCLUDE_DIRS})
+		set(CMAKE_REQUIRED_LIBRARIES ${SDL2_LIBRARIES})
+		check_cxx_source_compiles("#include <SDL_opengl.h>\n\
+#ifndef GL_VERSION_4_5\n\
+#error\n\
+#endif\n\
+int main() {}" GL_VERSION_4_5)
+		set(CMAKE_REQUIRED_INCLUDES "")
+		set(CMAKE_REQUIRED_LIBRARIES "")
+		if(GL_VERSION_4_5)
+			add_definitions(-DIRR_PREFER_SDL_GL_HEADER)
+		endif()
+	endif()
 endif()
 
 if(ENABLE_OPENGL3)

source/Irrlicht/COpenGLCommon.h

@@ -6,7 +6,7 @@
 
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 
-#if defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
+#if defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && defined(IRR_PREFER_SDL_GL_HEADER)
 	#include <SDL_video.h>
 	#include <SDL_opengl.h>
 #else