pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Miscellaneous Mac OS X fixes

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401645
This commit is contained in:
Sam Lantinga 2006-04-17 03:34:28 +00:00
parent ca1aba099a
commit 4b9dfebabd
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
configure.in
View file

@ -1811,6 +1811,9 @@ AC_HELP_STRING([--enable-sdl-dlopen], [use dlopen for shared object loading [[de
AC_TRY_COMPILE([ AC_TRY_COMPILE([
#include <dlfcn.h> #include <dlfcn.h>
],[ ],[
#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 have_dlopen=yes
]) ])
@ -2320,7 +2323,8 @@ case "$host" in
ARCH=macosx ARCH=macosx
# Mac OS X builds with both the Carbon and OSX APIs at the moment # 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 # 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 # is -lm which is not needed under Mac OS X. But for some reasons it
@ -2331,7 +2335,7 @@ case "$host" in
CheckDummyVideo CheckDummyVideo
CheckDiskAudio CheckDiskAudio
CheckDummyAudio CheckDummyAudio
#CheckDLOPEN # Don't check dlopen(), to retain 10.2 compatibility CheckDLOPEN
CheckCOCOA CheckCOCOA
CheckCARBON CheckCARBON
CheckX11 CheckX11

5
include/SDL_config_macosx.h
View file

@ -95,7 +95,12 @@
#define SDL_JOYSTICK_IOKIT 1 #define SDL_JOYSTICK_IOKIT 1
/* Enable various shared object loading systems */ /* 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 #define SDL_LOADSO_DLOPEN 1
#endif
/* Enable various threading systems */ /* Enable various threading systems */
#define SDL_THREAD_PTHREAD 1 #define SDL_THREAD_PTHREAD 1