# HG changeset patch
# User Ryan C. Gordon <icculus@icculus.org>
# Date 1263098565 0
# Node ID 3e043c661dfcf8c011f19b26f8abb9297c312b46
# Parent  2fbe6995b2a2856a1cd4a866d7b57dd7e6d6d336
Merged r4784:4785 from branches/SDL-1.2: Mac OS X linker command line fixes.

diff -r 2fbe6995b2a2 -r 3e043c661dfc configure.in
--- a/configure.in	Thu Jan 07 04:39:44 2010 +0000
+++ b/configure.in	Sun Jan 10 04:42:45 2010 +0000
@@ -1639,7 +1639,7 @@
         case "$host" in
             *-*-darwin*)
                 if test x$enable_video_cocoa = xyes; then
-                    EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,OpenGL"
+                    EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework OpenGL"
                 fi
         esac
     fi
@@ -2652,7 +2652,7 @@
             AC_DEFINE(SDL_HAPTIC_IOKIT)
             SOURCES="$SOURCES $srcdir/src/haptic/darwin/*.c"
             have_haptic=yes
-            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,ForceFeedback"
+            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework ForceFeedback"
         fi
         # Set up files for the power library
         if test x$enable_power = xyes; then
@@ -2669,12 +2669,12 @@
         # The Mac OS X platform requires special setup.
         EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings"
         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lobjc"
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Cocoa"
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Carbon"
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit"
+        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework Cocoa"
+        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework Carbon"
+        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework IOKit"
         # If audio is used, add the AudioUnit framework
         if test x$enable_audio = xyes; then
-            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreAudio -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit"
+            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework CoreAudio -framework AudioToolbox -framework AudioUnit"
         fi
         ;;
     *-riscos)
diff -r 2fbe6995b2a2 -r 3e043c661dfc test/configure.in
--- a/test/configure.in	Thu Jan 07 04:39:44 2010 +0000
+++ b/test/configure.in	Sun Jan 10 04:42:45 2010 +0000
@@ -28,7 +28,7 @@
     *-*-darwin* )
         EXE=""
         MATHLIB=""
-        SYS_GL_LIBS="-Wl,-framework,OpenGL"
+        SYS_GL_LIBS="-framework,OpenGL"
         ;;
     *-*-aix*)
         EXE=""