Commit 065e14eb authored by Ryan C. Gordon's avatar Ryan C. Gordon

Merged r4784:4785 from branches/SDL-1.2: Mac OS X linker command line fixes.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404373
parent 80c18796
...@@ -1639,7 +1639,7 @@ CheckMacGL() ...@@ -1639,7 +1639,7 @@ CheckMacGL()
case "$host" in case "$host" in
*-*-darwin*) *-*-darwin*)
if test x$enable_video_cocoa = xyes; then if test x$enable_video_cocoa = xyes; then
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,OpenGL" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework OpenGL"
fi fi
esac esac
fi fi
...@@ -2652,7 +2652,7 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau ...@@ -2652,7 +2652,7 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
AC_DEFINE(SDL_HAPTIC_IOKIT) AC_DEFINE(SDL_HAPTIC_IOKIT)
SOURCES="$SOURCES $srcdir/src/haptic/darwin/*.c" SOURCES="$SOURCES $srcdir/src/haptic/darwin/*.c"
have_haptic=yes have_haptic=yes
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,ForceFeedback" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework ForceFeedback"
fi fi
# Set up files for the power library # Set up files for the power library
if test x$enable_power = xyes; then if test x$enable_power = xyes; then
...@@ -2669,12 +2669,12 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau ...@@ -2669,12 +2669,12 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
# The Mac OS X platform requires special setup. # The Mac OS X platform requires special setup.
EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings" EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lobjc" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lobjc"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Cocoa" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework Cocoa"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Carbon" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework Carbon"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework IOKit"
# If audio is used, add the AudioUnit framework # If audio is used, add the AudioUnit framework
if test x$enable_audio = xyes; then 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 fi
;; ;;
*-riscos) *-riscos)
......
...@@ -28,7 +28,7 @@ case "$host" in ...@@ -28,7 +28,7 @@ case "$host" in
*-*-darwin* ) *-*-darwin* )
EXE="" EXE=""
MATHLIB="" MATHLIB=""
SYS_GL_LIBS="-Wl,-framework,OpenGL" SYS_GL_LIBS="-framework,OpenGL"
;; ;;
*-*-aix*) *-*-aix*)
EXE="" EXE=""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment