diff options
Diffstat (limited to 'code')
| -rw-r--r-- | code/client/snd_openal.c | 2 | ||||
| -rwxr-xr-x | code/libs/macosx/libSDL-1.2.0.dylib | bin | 1506244 -> 4469500 bytes | |||
| -rw-r--r-- | code/qcommon/files.c | 4 | ||||
| -rw-r--r-- | code/unix/sdl_glimp.c | 7 | ||||
| -rw-r--r-- | code/unix/unix_net.c | 4 |
5 files changed, 16 insertions, 1 deletions
diff --git a/code/client/snd_openal.c b/code/client/snd_openal.c index d9e8393..1cbd714 100644 --- a/code/client/snd_openal.c +++ b/code/client/snd_openal.c @@ -1524,6 +1524,8 @@ static ALCcontext *alContext; #ifdef _WIN32 #define ALDRIVER_DEFAULT "OpenAL32.dll" +#elif defined(MACOS_X) +#define ALDRIVER_DEFAULT "/System/Library/Frameworks/OpenAL.framework/OpenAL" #else #define ALDRIVER_DEFAULT "libopenal.so.0" #endif diff --git a/code/libs/macosx/libSDL-1.2.0.dylib b/code/libs/macosx/libSDL-1.2.0.dylib Binary files differindex dce6184..3c51054 100755 --- a/code/libs/macosx/libSDL-1.2.0.dylib +++ b/code/libs/macosx/libSDL-1.2.0.dylib diff --git a/code/qcommon/files.c b/code/qcommon/files.c index af5518b..4227128 100644 --- a/code/qcommon/files.c +++ b/code/qcommon/files.c @@ -2829,6 +2829,10 @@ static void FS_Startup( const char *gameName ) { if (fs_basepath->string[0]) { FS_AddGameDirectory( fs_basepath->string, gameName ); } +#ifdef MACOS_X + // allow .app bundles to be placed along side base dir + FS_AddGameDirectory( ".", gameName ); +#endif // fs_homepath is somewhat particular to *nix systems, only add if relevant // NOTE: same filtering below for mods and basegame if (fs_basepath->string[0] && Q_stricmp(fs_homepath->string,fs_basepath->string)) { diff --git a/code/unix/sdl_glimp.c b/code/unix/sdl_glimp.c index 9634e9f..a24b4eb 100644 --- a/code/unix/sdl_glimp.c +++ b/code/unix/sdl_glimp.c @@ -67,7 +67,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#if USE_SDL_VIDEO +#include "SDL.h" +#include "SDL_loadso.h" +#else #include <dlfcn.h> +#endif #include "../renderer/tr_local.h" #include "../client/client.h" @@ -832,7 +837,7 @@ static void GLW_InitExtensions( void ) if ( strstr( glConfig.extensions_string, "GL_EXT_texture_filter_anisotropic" ) ) { if ( r_ext_texture_filter_anisotropic->integer ) { - qglGetIntegerv( GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &maxAnisotropy ); + qglGetIntegerv( GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, (GLint *)&maxAnisotropy ); if ( maxAnisotropy <= 0 ) { ri.Printf( PRINT_ALL, "...GL_EXT_texture_filter_anisotropic not properly supported!\n" ); maxAnisotropy = 0; diff --git a/code/unix/unix_net.c b/code/unix/unix_net.c index d84f985..73c0fd6 100644 --- a/code/unix/unix_net.c +++ b/code/unix/unix_net.c @@ -25,6 +25,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "../qcommon/qcommon.h" #include <unistd.h> +#if MAC_OS_X_VERSION_MIN_REQUIRED == 1020 + // needed for socket_t on OSX 10.2 + #define _BSD_SOCKLEN_T_ +#endif #include <sys/socket.h> #include <sys/time.h> #include <netinet/in.h> |