There are several subsystems that need IOKit linked in on Mac OS X, so handle
cases where one or more of them are disabled. --HG-- branch : SDL-1.2 extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402302
This commit is contained in:
parent
2dc670fd22
commit
b120a012d2
1 changed files with 6 additions and 1 deletions
|
@ -2462,8 +2462,8 @@ case "$host" in
|
||||||
if test x$enable_joystick = xyes; then
|
if test x$enable_joystick = xyes; then
|
||||||
AC_DEFINE(SDL_JOYSTICK_IOKIT)
|
AC_DEFINE(SDL_JOYSTICK_IOKIT)
|
||||||
SOURCES="$SOURCES $srcdir/src/joystick/darwin/*.c"
|
SOURCES="$SOURCES $srcdir/src/joystick/darwin/*.c"
|
||||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit"
|
|
||||||
have_joystick=yes
|
have_joystick=yes
|
||||||
|
need_iokit_framework=yes
|
||||||
fi
|
fi
|
||||||
# Set up files for the cdrom library
|
# Set up files for the cdrom library
|
||||||
if test x$enable_cdrom = xyes; then
|
if test x$enable_cdrom = xyes; then
|
||||||
|
@ -2483,6 +2483,7 @@ case "$host" in
|
||||||
SDL_LIBS="-lSDLmain $SDL_LIBS"
|
SDL_LIBS="-lSDLmain $SDL_LIBS"
|
||||||
if test x$enable_video_cocoa = xyes; then
|
if test x$enable_video_cocoa = xyes; then
|
||||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Cocoa"
|
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Cocoa"
|
||||||
|
need_iokit_framework=yes
|
||||||
fi
|
fi
|
||||||
if test x$enable_video_carbon = xyes -o x$enable_video_cocoa = xyes; then
|
if test x$enable_video_carbon = xyes -o x$enable_video_cocoa = xyes; then
|
||||||
# The Cocoa backend still needs Carbon, and the YUV code QuickTime
|
# The Cocoa backend still needs Carbon, and the YUV code QuickTime
|
||||||
|
@ -2493,6 +2494,10 @@ case "$host" in
|
||||||
if test x$enable_audio = xyes -o x$enable_cdrom = xyes; then
|
if test x$enable_audio = xyes -o x$enable_cdrom = xyes; then
|
||||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit"
|
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit"
|
||||||
fi
|
fi
|
||||||
|
# Some subsystems reference IOKit...
|
||||||
|
if test x$need_iokit_framework = xyes; then
|
||||||
|
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit"
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
*-*-mint*)
|
*-*-mint*)
|
||||||
ARCH=mint
|
ARCH=mint
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue