diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2009-10-25 22:36:32 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2009-10-25 22:36:32 +0000 |
| commit | 5be1c40fe6b1248035b3ceee2b7455e70d4dfaff (patch) | |
| tree | c56cc5079bd20ad5469559d380e424d7843cf0f3 | |
| parent | 1ba1ffc2ed124f779bad0877a9176c5b30a9aef7 (diff) | |
| download | ioquake3-aero-5be1c40fe6b1248035b3ceee2b7455e70d4dfaff.tar.gz ioquake3-aero-5be1c40fe6b1248035b3ceee2b7455e70d4dfaff.zip | |
* Bump the minimum SDL version up to 1.2.10, and remove workarounds for earlier versions
git-svn-id: svn://svn.icculus.org/quake3/trunk@1706 edf5b092-35ff-0310-97b2-ce42778d08ea
| -rw-r--r-- | code/sdl/sdl_glimp.c | 24 | ||||
| -rw-r--r-- | code/sys/sys_local.h | 2 |
2 files changed, 2 insertions, 24 deletions
diff --git a/code/sdl/sdl_glimp.c b/code/sdl/sdl_glimp.c index 0039497..0469010 100644 --- a/code/sdl/sdl_glimp.c +++ b/code/sdl/sdl_glimp.c @@ -26,13 +26,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # include <SDL.h> #endif -#if !SDL_VERSION_ATLEAST(1, 2, 10) -#define SDL_GL_ACCELERATED_VISUAL 15 -#define SDL_GL_SWAP_CONTROL 16 -#elif MINSDL_PATCH >= 10 -#error Code block no longer necessary, please remove -#endif - #ifdef SMP # ifdef USE_LOCAL_HEADERS # include "SDL_thread.h" @@ -152,16 +145,8 @@ static void GLimp_DetectAvailableModes(void) SDL_Rect **modes; int numModes; int i; - SDL_PixelFormat *format = NULL; -#if SDL_VERSION_ATLEAST(1, 2, 10) - format = videoInfo->vfmt; -# if MINSDL_PATCH >= 10 -# error Ifdeffery no longer necessary, please remove -# endif -#endif - - modes = SDL_ListModes( format, SDL_OPENGL | SDL_FULLSCREEN ); + modes = SDL_ListModes( videoInfo->vfmt, SDL_OPENGL | SDL_FULLSCREEN ); if( !modes ) { @@ -219,12 +204,6 @@ static int GLimp_SetMode( int mode, qboolean fullscreen ) if ( r_allowResize->integer ) flags |= SDL_RESIZABLE; -#if !SDL_VERSION_ATLEAST(1, 2, 10) - // 1.2.10 is needed to get the desktop resolution - displayAspect = 4.0f / 3.0f; -#elif MINSDL_PATCH >= 10 -# error Ifdeffery no longer necessary, please remove -#else if( videoInfo == NULL ) { static SDL_VideoInfo sVideoInfo; @@ -254,7 +233,6 @@ static int GLimp_SetMode( int mode, qboolean fullscreen ) "Cannot estimate display aspect, assuming 1.333\n" ); } } -#endif ri.Printf (PRINT_ALL, "...setting mode %d:", mode ); diff --git a/code/sys/sys_local.h b/code/sys/sys_local.h index 6174876..ee808d4 100644 --- a/code/sys/sys_local.h +++ b/code/sys/sys_local.h @@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // Require a minimum version of SDL #define MINSDL_MAJOR 1 #define MINSDL_MINOR 2 -#define MINSDL_PATCH 7 +#define MINSDL_PATCH 10 // Input subsystem void IN_Init( void ); |