diff options
| author | Tim Angus <tim@ngus.net> | 2013-01-17 13:31:30 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2014-08-28 10:58:28 +0100 |
| commit | af45b9f4614d7018146e68832de3bccb1c73f7e7 (patch) | |
| tree | f563cc4f23e453d7d1fa13e6c71ffcb7e8ec7bcd /src/sys | |
| parent | 7426441a5bc9c4eaf28a7f64a22df8bdaa71162c (diff) | |
Use SDL 2 instead of SDL 1.2
Diffstat (limited to 'src/sys')
| -rw-r--r-- | src/sys/sys_local.h | 8 | ||||
| -rw-r--r-- | src/sys/sys_main.c | 11 |
2 files changed, 8 insertions, 11 deletions
diff --git a/src/sys/sys_local.h b/src/sys/sys_local.h index a0812fa5..3c16876d 100644 --- a/src/sys/sys_local.h +++ b/src/sys/sys_local.h @@ -25,12 +25,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "../qcommon/qcommon.h" // Require a minimum version of SDL -#define MINSDL_MAJOR 1 -#define MINSDL_MINOR 2 -#define MINSDL_PATCH 10 +#define MINSDL_MAJOR 2 +#define MINSDL_MINOR 0 +#define MINSDL_PATCH 0 // Input subsystem -void IN_Init( void ); +void IN_Init( void *windowData ); void IN_Frame( void ); void IN_Shutdown( void ); void IN_Restart( void ); diff --git a/src/sys/sys_main.c b/src/sys/sys_main.c index 9ccd6d2e..4e1c2141 100644 --- a/src/sys/sys_main.c +++ b/src/sys/sys_main.c @@ -248,12 +248,8 @@ cpuFeatures_t Sys_GetProcessorFeatures( void ) #ifndef DEDICATED if( SDL_HasRDTSC( ) ) features |= CF_RDTSC; if( SDL_HasMMX( ) ) features |= CF_MMX; - if( SDL_HasMMXExt( ) ) features |= CF_MMX_EXT; - if( SDL_Has3DNow( ) ) features |= CF_3DNOW; - if( SDL_Has3DNowExt( ) ) features |= CF_3DNOW_EXT; if( SDL_HasSSE( ) ) features |= CF_SSE; if( SDL_HasSSE2( ) ) features |= CF_SSE2; - if( SDL_HasAltiVec( ) ) features |= CF_ALTIVEC; #endif return features; @@ -596,19 +592,20 @@ int main( int argc, char **argv ) # endif // Run time - const SDL_version *ver = SDL_Linked_Version( ); + SDL_version ver; + SDL_VERSION( &ver ); #define MINSDL_VERSION \ XSTRING(MINSDL_MAJOR) "." \ XSTRING(MINSDL_MINOR) "." \ XSTRING(MINSDL_PATCH) - if( SDL_VERSIONNUM( ver->major, ver->minor, ver->patch ) < + if( SDL_VERSIONNUM( ver.major, ver.minor, ver.patch ) < SDL_VERSIONNUM( MINSDL_MAJOR, MINSDL_MINOR, MINSDL_PATCH ) ) { Sys_Dialog( DT_ERROR, va( "SDL version " MINSDL_VERSION " or greater is required, " "but only version %d.%d.%d was found. You may be able to obtain a more recent copy " - "from http://www.libsdl.org/.", ver->major, ver->minor, ver->patch ), "SDL Library Too Old" ); + "from http://www.libsdl.org/.", ver.major, ver.minor, ver.patch ), "SDL Library Too Old" ); Sys_Exit( 1 ); } |