GL functions have stdcall convention on windows, so that needs to be included in the cast

note that windows build is currently broken - comment out
const size_t CUnit::invalidId;
in Unit.cpp (seems to be a dark corner of the C++ standard, am currently
discussing this with simon)

This was SVN commit r6158.
This commit is contained in:
janwas 2008-06-29 21:32:52 +00:00
parent 697ef257d5
commit 8bb535de75

View File

@ -228,13 +228,13 @@ static void importExtensionFunctions()
// checking for the extension.
// (TODO: this calls ogl_HaveVersion far more times than is necessary -
// we should probably use the have_* variables instead)
#define FUNC(ret, name, params) p##name = (ret (*) params)SDL_GL_GetProcAddress(#name);
#define FUNC(ret, name, params) p##name = (ret (GL_CALL_CONV*) params)SDL_GL_GetProcAddress(#name);
#define FUNC2(ret, nameARB, nameCore, version, params) \
p##nameARB = NULL; \
if(ogl_HaveVersion(version)) \
p##nameARB = (ret (*) params)SDL_GL_GetProcAddress(#nameCore); \
p##nameARB = (ret (GL_CALL_CONV*) params)SDL_GL_GetProcAddress(#nameCore); \
if(!p##nameARB) /* use the ARB name if the driver lied about what version it supports */ \
p##nameARB = (ret (*) params)SDL_GL_GetProcAddress(#nameARB);
p##nameARB = (ret (GL_CALL_CONV*) params)SDL_GL_GetProcAddress(#nameARB);
#include "glext_funcs.h"
#undef FUNC2
#undef FUNC