diff options
| author | tjw <tjw@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2006-08-02 04:01:36 +0000 |
|---|---|---|
| committer | tjw <tjw@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2006-08-02 04:01:36 +0000 |
| commit | 3b416e75cf3a6c81d4dd1d83418a3b42d739f72f (patch) | |
| tree | 7654c52f2c471984a4c507ba0256e2057df086af /code/unix | |
| parent | e6a0afad175d5c1ec113ed652e39b30ba15180d2 (diff) | |
| download | ioquake3-aero-3b416e75cf3a6c81d4dd1d83418a3b42d739f72f.tar.gz ioquake3-aero-3b416e75cf3a6c81d4dd1d83418a3b42d739f72f.zip | |
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
Diffstat (limited to 'code/unix')
| -rw-r--r-- | code/unix/sdl_glimp.c | 7 | ||||
| -rw-r--r-- | code/unix/unix_net.c | 4 |
2 files changed, 10 insertions, 1 deletions
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> |