Merged r4784:4785 from branches/SDL-1.2: Mac OS X linker command line fixes.
authorRyan C. Gordon <icculus@icculus.org>
Sun, 10 Jan 2010 04:42:45 +0000
changeset 36223e043c661dfc
parent 3621 2fbe6995b2a2
child 3623 9a73fecd9181
Merged r4784:4785 from branches/SDL-1.2: Mac OS X linker command line fixes.
configure.in
test/configure.in
     1.1 --- a/configure.in	Thu Jan 07 04:39:44 2010 +0000
     1.2 +++ b/configure.in	Sun Jan 10 04:42:45 2010 +0000
     1.3 @@ -1639,7 +1639,7 @@
     1.4          case "$host" in
     1.5              *-*-darwin*)
     1.6                  if test x$enable_video_cocoa = xyes; then
     1.7 -                    EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,OpenGL"
     1.8 +                    EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework OpenGL"
     1.9                  fi
    1.10          esac
    1.11      fi
    1.12 @@ -2652,7 +2652,7 @@
    1.13              AC_DEFINE(SDL_HAPTIC_IOKIT)
    1.14              SOURCES="$SOURCES $srcdir/src/haptic/darwin/*.c"
    1.15              have_haptic=yes
    1.16 -            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,ForceFeedback"
    1.17 +            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework ForceFeedback"
    1.18          fi
    1.19          # Set up files for the power library
    1.20          if test x$enable_power = xyes; then
    1.21 @@ -2669,12 +2669,12 @@
    1.22          # The Mac OS X platform requires special setup.
    1.23          EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings"
    1.24          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lobjc"
    1.25 -        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Cocoa"
    1.26 -        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Carbon"
    1.27 -        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit"
    1.28 +        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework Cocoa"
    1.29 +        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework Carbon"
    1.30 +        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework IOKit"
    1.31          # If audio is used, add the AudioUnit framework
    1.32          if test x$enable_audio = xyes; then
    1.33 -            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreAudio -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit"
    1.34 +            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework CoreAudio -framework AudioToolbox -framework AudioUnit"
    1.35          fi
    1.36          ;;
    1.37      *-riscos)
     2.1 --- a/test/configure.in	Thu Jan 07 04:39:44 2010 +0000
     2.2 +++ b/test/configure.in	Sun Jan 10 04:42:45 2010 +0000
     2.3 @@ -28,7 +28,7 @@
     2.4      *-*-darwin* )
     2.5          EXE=""
     2.6          MATHLIB=""
     2.7 -        SYS_GL_LIBS="-Wl,-framework,OpenGL"
     2.8 +        SYS_GL_LIBS="-framework,OpenGL"
     2.9          ;;
    2.10      *-*-aix*)
    2.11          EXE=""