Merge branch 'fix-gplusplus-name-mangling' into 'master'

Fix symbol lookup error caused by GL_GetProcAddress name being mangled by g++

See merge request STJr/UltimateZoneBuilder!16
This commit is contained in:
sphere 2023-12-09 12:46:15 +00:00
commit d337096132

View file

@ -934,7 +934,7 @@ std::unique_ptr<IOpenGLContext> IOpenGLContext::Create(void* disp, void* window)
return ctx;
}
void* GL_GetProcAddress(const char* function_name)
extern "C" void* GL_GetProcAddress(const char* function_name)
{
if (glx_global.glXGetProcAddressARB)
return (void*)glx_global.glXGetProcAddressARB((GLubyte*)function_name);