From 77c1837c789c50ed8fa80f6a862d33387e432125 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Mon, 14 Aug 2006 21:11:20 +0000 Subject: * Merged ioq3-r838 - OS X Universal Binary creation script - OS X x86 support - OS X vm support - SDL video mode selection bug fix - "Home directory" support on windows - Windows SMP deadlock fix - Improved JPEG quality (screenshots/video) - AVIs recorded with \video command are now actually AVIs - Usual assortment of ioq3 tweaks and fixes --- src/unix/sdl_glimp.c | 8 +++++++- src/unix/unix_net.c | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'src/unix') diff --git a/src/unix/sdl_glimp.c b/src/unix/sdl_glimp.c index fcab7125..b2cc13a4 100644 --- a/src/unix/sdl_glimp.c +++ b/src/unix/sdl_glimp.c @@ -68,7 +68,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#if USE_SDL_VIDEO +#include "SDL.h" +#include "SDL_loadso.h" +#else #include +#endif #include "../renderer/tr_local.h" #include "../client/client.h" @@ -555,7 +560,7 @@ static qboolean GLW_StartDriverAndSetMode( const char *drivername, static int GLW_SetMode( const char *drivername, int mode, qboolean fullscreen ) { const char* glstring; // bk001130 - from cvs1.17 (mkv) - int sdlcolorbits = 4; + int sdlcolorbits; int colorbits, depthbits, stencilbits; int tcolorbits, tdepthbits, tstencilbits; int i = 0; @@ -651,6 +656,7 @@ static int GLW_SetMode( const char *drivername, int mode, qboolean fullscreen ) tstencilbits = 0; } + sdlcolorbits = 4; if (tcolorbits == 24) sdlcolorbits = 8; diff --git a/src/unix/unix_net.c b/src/unix/unix_net.c index a7d8a088..d89e766a 100644 --- a/src/unix/unix_net.c +++ b/src/unix/unix_net.c @@ -26,6 +26,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "../qcommon/qcommon.h" #include +#if MAC_OS_X_VERSION_MIN_REQUIRED == 1020 + // needed for socket_t on OSX 10.2 + #define _BSD_SOCKLEN_T_ +#endif #include #include #include -- cgit