1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-29 04:20:29 +00:00

Merge branch 'master' into 'master'

When building Win32 (VS 2019), there are problems in line 45.

See merge request OpenMW/openmw!1953
This commit is contained in:
AnyOldName3 2022-05-30 20:20:53 +00:00
commit e24a85419a

View File

@ -42,7 +42,7 @@ either expressed or implied, of the FreeBSD Project.
namespace Debug
{
void debugCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam)
void GL_APIENTRY debugCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam)
{
#ifdef GL_DEBUG_OUTPUT
std::string srcStr;