Mac OS X port always links with IOKit framework in SDL 1.3.
authorRyan C. Gordon <icculus@icculus.org>
Wed, 04 Apr 2007 10:41:00 +0000
changeset 2104 a76e8b9f3d2e
parent 2103 4a010418f3b9
child 2105 12bcd4fd2606
Mac OS X port always links with IOKit framework in SDL 1.3.
configure.in
--- a/configure.in	Wed Apr 04 10:39:16 2007 +0000
+++ b/configure.in	Wed Apr 04 10:41:00 2007 +0000
@@ -2347,7 +2347,6 @@
         if test x$enable_joystick = xyes; then
             AC_DEFINE(SDL_JOYSTICK_IOKIT)
             SOURCES="$SOURCES $srcdir/src/joystick/darwin/*.c"
-            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit"
             have_joystick=yes
         fi
         # Set up files for the cdrom library
@@ -2366,6 +2365,7 @@
         EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings"
         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Cocoa"
         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Carbon"
+        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit"
         # If either the audio or CD driver is used, add the AudioUnit framework
         if test x$enable_audio = xyes -o x$enable_cdrom = xyes; then
             EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreAudio -framework,AudioToolbox -Wl,-framework,AudioUnit"