From 3b416e75cf3a6c81d4dd1d83418a3b42d739f72f Mon Sep 17 00:00:00 2001 From: tjw Date: Wed, 2 Aug 2006 04:01:36 +0000 Subject: bug 2723 * adds a shell script ./make-macosx-ub.sh that builds Mac OS X Universal Binary * fixes Mac OS X x86 VM crashes (-mstackrealign) * adds current working directory to the search path on Mac OS X to make working with .app bundles easier * various tweaks to make ioquake3 build against the 10.2 SDK * changed default OpenAL .dylib location to the path of the one included with the Framework bundled in 10.4 (for USE_OPENAL_DLOPEN) * updated to a Universal libSDL-1.2.0.dylib git-svn-id: svn://svn.icculus.org/quake3/trunk@830 edf5b092-35ff-0310-97b2-ce42778d08ea --- code/client/snd_openal.c | 2 ++ code/libs/macosx/libSDL-1.2.0.dylib | Bin 1506244 -> 4469500 bytes code/qcommon/files.c | 4 ++++ code/unix/sdl_glimp.c | 7 ++++++- code/unix/unix_net.c | 4 ++++ 5 files changed, 16 insertions(+), 1 deletion(-) (limited to 'code') 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 index dce6184..3c51054 100755 Binary files a/code/libs/macosx/libSDL-1.2.0.dylib and b/code/libs/macosx/libSDL-1.2.0.dylib differ 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 #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" @@ -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 +#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 v1.2.3