Miscellaneous Mac OS X fixes
authorSam Lantinga <slouken@libsdl.org>
Mon, 17 Apr 2006 03:34:28 +0000
changeset 1638ebd1aedb1292
parent 1637 9ba366b919c7
child 1639 0f466fb614a9
Miscellaneous Mac OS X fixes
configure.in
include/SDL_config_macosx.h
     1.1 --- a/configure.in	Fri Apr 14 06:03:09 2006 +0000
     1.2 +++ b/configure.in	Mon Apr 17 03:34:28 2006 +0000
     1.3 @@ -1811,6 +1811,9 @@
     1.4          AC_TRY_COMPILE([
     1.5           #include <dlfcn.h>
     1.6          ],[
     1.7 +         #if defined(MAC_OS_X_VERSION_MIN_REQUIRED) && MAC_OS_X_VERSION_MIN_REQUIRED <= 1020
     1.8 +         #error Use dlcompat for Mac OS X 10.2 compatibility
     1.9 +         #endif
    1.10          ],[
    1.11          have_dlopen=yes
    1.12          ])
    1.13 @@ -2320,7 +2323,8 @@
    1.14          ARCH=macosx
    1.15  
    1.16          # Mac OS X builds with both the Carbon and OSX APIs at the moment
    1.17 -        EXTRA_CFLAGS="-DTARGET_API_MAC_CARBON -DTARGET_API_MAC_OSX"
    1.18 +        EXTRA_CFLAGS="$EXTRA_CFLAGS -DTARGET_API_MAC_CARBON"
    1.19 +        EXTRA_CFLAGS="$EXTRA_CFLAGS -DTARGET_API_MAC_OSX"
    1.20  
    1.21          # HACK: Reset EXTRA_LDFLAGS; the only thing it contains at this point
    1.22          # is -lm which is not needed under Mac OS X. But for some reasons it
    1.23 @@ -2331,7 +2335,7 @@
    1.24          CheckDummyVideo
    1.25          CheckDiskAudio
    1.26          CheckDummyAudio
    1.27 -        #CheckDLOPEN # Don't check dlopen(), to retain 10.2 compatibility
    1.28 +        CheckDLOPEN
    1.29          CheckCOCOA
    1.30          CheckCARBON
    1.31          CheckX11
     2.1 --- a/include/SDL_config_macosx.h	Fri Apr 14 06:03:09 2006 +0000
     2.2 +++ b/include/SDL_config_macosx.h	Mon Apr 17 03:34:28 2006 +0000
     2.3 @@ -95,7 +95,12 @@
     2.4  #define SDL_JOYSTICK_IOKIT	1
     2.5  
     2.6  /* Enable various shared object loading systems */
     2.7 +#ifdef __ppc__
     2.8 +/* For Mac OS X 10.2 compatibility */
     2.9 +#define SDL_LOADSO_DLCOMPAT	1
    2.10 +#else
    2.11  #define SDL_LOADSO_DLOPEN	1
    2.12 +#endif
    2.13  
    2.14  /* Enable various threading systems */
    2.15  #define SDL_THREAD_PTHREAD	1