aboutsummaryrefslogtreecommitdiffstats
path: root/code
diff options
context:
space:
mode:
Diffstat (limited to 'code')
-rw-r--r--code/sdl/sdl_glimp.c6
-rw-r--r--code/sys/sys_main.c8
2 files changed, 11 insertions, 3 deletions
diff --git a/code/sdl/sdl_glimp.c b/code/sdl/sdl_glimp.c
index c5954ac..a1e1a27 100644
--- a/code/sdl/sdl_glimp.c
+++ b/code/sdl/sdl_glimp.c
@@ -396,9 +396,9 @@ static void GLimp_InitExtensions( void )
{
if ( r_ext_multitexture->value )
{
- qglMultiTexCoord2fARB = ( PFNGLMULTITEXCOORD2FARBPROC ) SDL_GL_GetProcAddress( "glMultiTexCoord2fARB" );
- qglActiveTextureARB = ( PFNGLACTIVETEXTUREARBPROC ) SDL_GL_GetProcAddress( "glActiveTextureARB" );
- qglClientActiveTextureARB = ( PFNGLCLIENTACTIVETEXTUREARBPROC ) SDL_GL_GetProcAddress( "glClientActiveTextureARB" );
+ qglMultiTexCoord2fARB = SDL_GL_GetProcAddress( "glMultiTexCoord2fARB" );
+ qglActiveTextureARB = SDL_GL_GetProcAddress( "glActiveTextureARB" );
+ qglClientActiveTextureARB = SDL_GL_GetProcAddress( "glClientActiveTextureARB" );
if ( qglActiveTextureARB )
{
diff --git a/code/sys/sys_main.c b/code/sys/sys_main.c
index 30039d7..bf0eb94 100644
--- a/code/sys/sys_main.c
+++ b/code/sys/sys_main.c
@@ -587,6 +587,14 @@ int main( int argc, char **argv )
char commandLine[ MAX_STRING_CHARS ] = { 0 };
#ifndef DEDICATED
+ // SDL version check
+
+ // Compile time
+# if !SDL_VERSION_ATLEAST(MINSDL_MAJOR,MINSDL_MINOR,MINSDL_PATCH)
+# error A more recent version of SDL is required
+# endif
+
+ // Run time
const SDL_version *ver = SDL_Linked_Version( );
#define STRING(s) #s