Mercurial > sdl-ios-xcode
changeset 3622:3e043c661dfc
Merged r4784:4785 from branches/SDL-1.2: Mac OS X linker command line fixes.
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Sun, 10 Jan 2010 04:42:45 +0000 |
| parents | 2fbe6995b2a2 |
| children | 9a73fecd9181 |
| files | configure.in test/configure.in |
| diffstat | 2 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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)