From 4fb13ccee89b6fa3a6a6f5573d3d618369835f7a Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 21 Sep 2009 10:23:19 +0000 Subject: [PATCH] Fixed bug #674 Matej 2009-01-08 09:25:34 PST Hello, I maintain a cross-platform project that uses SDL. One of the users who runs OSX has told me that he has problems with linking to SDL due to missing -framework option. I think that the problem is because of this: 'sdl-config --libs' outputs '-L/opt/local/lib -lSDLmain -lSDL -Wl,-framework,Cocoa' All the options are passed to the linker except the last one. I think that the good output should be just: '-L/opt/local/lib -lSDLmain -lSDL -framework Cocoa' since those options (--libs) are passed to the linker, so the '-Wl' option is redundant and possibly harmful in this very case I use autotools with libtool to do the build... Regards, Matej --- configure.in | 12 ++++++------ test/configure.in | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure.in b/configure.in index 55489b676..6d373b3b7 100644 --- a/configure.in +++ b/configure.in @@ -1644,7 +1644,7 @@ CheckMacGL() 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 @@ -2657,7 +2657,7 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau 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 @@ -2674,12 +2674,12 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau # 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 either the audio or CD driver 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 --git a/test/configure.in b/test/configure.in index b24b6a6fe..f2cfb993f 100644 --- a/test/configure.in +++ b/test/configure.in @@ -28,7 +28,7 @@ case "$host" in *-*-darwin* ) EXE="" MATHLIB="" - SYS_GL_LIBS="-Wl,-framework,OpenGL" + SYS_GL_LIBS="-framework OpenGL" ;; *-*-aix*) EXE=""