From af200c67a3c18d9f419d9188a38a62e350b5432e Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 17 Apr 2006 03:34:28 +0000 Subject: [PATCH] Miscellaneous Mac OS X fixes --- configure.in | 8 ++++++-- include/SDL_config_macosx.h | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 75d82d665..782b396a3 100644 --- a/configure.in +++ b/configure.in @@ -1811,6 +1811,9 @@ AC_HELP_STRING([--enable-sdl-dlopen], [use dlopen for shared object loading [[de AC_TRY_COMPILE([ #include ],[ + #if defined(MAC_OS_X_VERSION_MIN_REQUIRED) && MAC_OS_X_VERSION_MIN_REQUIRED <= 1020 + #error Use dlcompat for Mac OS X 10.2 compatibility + #endif ],[ have_dlopen=yes ]) @@ -2320,7 +2323,8 @@ case "$host" in ARCH=macosx # Mac OS X builds with both the Carbon and OSX APIs at the moment - EXTRA_CFLAGS="-DTARGET_API_MAC_CARBON -DTARGET_API_MAC_OSX" + EXTRA_CFLAGS="$EXTRA_CFLAGS -DTARGET_API_MAC_CARBON" + EXTRA_CFLAGS="$EXTRA_CFLAGS -DTARGET_API_MAC_OSX" # HACK: Reset EXTRA_LDFLAGS; the only thing it contains at this point # is -lm which is not needed under Mac OS X. But for some reasons it @@ -2331,7 +2335,7 @@ case "$host" in CheckDummyVideo CheckDiskAudio CheckDummyAudio - #CheckDLOPEN # Don't check dlopen(), to retain 10.2 compatibility + CheckDLOPEN CheckCOCOA CheckCARBON CheckX11 diff --git a/include/SDL_config_macosx.h b/include/SDL_config_macosx.h index 5e89e4440..b4cc8ca4c 100644 --- a/include/SDL_config_macosx.h +++ b/include/SDL_config_macosx.h @@ -95,7 +95,12 @@ #define SDL_JOYSTICK_IOKIT 1 /* Enable various shared object loading systems */ +#ifdef __ppc__ +/* For Mac OS X 10.2 compatibility */ +#define SDL_LOADSO_DLCOMPAT 1 +#else #define SDL_LOADSO_DLOPEN 1 +#endif /* Enable various threading systems */ #define SDL_THREAD_PTHREAD 1