diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-11-25 23:41:01 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-11-25 23:41:01 +0000 |
| commit | daa6b52744a1530591e0717d99976c30e5e8e0a6 (patch) | |
| tree | 6fc4ba29584cf9d2441ef8d64d1d4f8c5e108eaf /code | |
| parent | 75e6bcf119724b1d3db26707da856e48802e59b4 (diff) | |
| download | ioquake3-aero-daa6b52744a1530591e0717d99976c30e5e8e0a6.tar.gz ioquake3-aero-daa6b52744a1530591e0717d99976c30e5e8e0a6.zip | |
* Move SDL library version check to sys_main.c as it's proving difficult to
make the Makefile check sufficiently portable
* Remove unnecessary GL PFN... casts from SDL_GL_GetProcAddress calls
* Replace OS X uname workaround with Solaris workaround, as I believe OS X
uname now behaves the same as GNU name
git-svn-id: svn://svn.icculus.org/quake3/trunk@1217 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code')
| -rw-r--r-- | code/sdl/sdl_glimp.c | 6 | ||||
| -rw-r--r-- | code/sys/sys_main.c | 8 |
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 |