Commit 6e84a21e authored by Sam Lantinga's avatar Sam Lantinga

Whoops, this breaks building on Mac OS X 10.4

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%403875
parent 45c45e3e
...@@ -1685,10 +1685,10 @@ CheckMacGL() ...@@ -1685,10 +1685,10 @@ 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 -framework OpenGL" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,OpenGL"
fi fi
if test x$enable_video_carbon = xyes; then if test x$enable_video_carbon = xyes; then
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework AGL" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,AGL"
fi fi
esac esac
fi fi
...@@ -2695,21 +2695,21 @@ case "$host" in ...@@ -2695,21 +2695,21 @@ case "$host" in
EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings" EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings"
SDL_LIBS="-lSDLmain $SDL_LIBS" SDL_LIBS="-lSDLmain $SDL_LIBS"
if test x$enable_video_cocoa = xyes; then if test x$enable_video_cocoa = xyes; then
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework Cocoa" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Cocoa"
need_iokit_framework=yes need_iokit_framework=yes
fi fi
if test x$enable_video_carbon = xyes -o x$enable_video_cocoa = xyes; then if test x$enable_video_carbon = xyes -o x$enable_video_cocoa = xyes; then
# The Cocoa backend still needs Carbon # The Cocoa backend still needs Carbon
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework ApplicationServices" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,ApplicationServices"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework Carbon" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Carbon"
fi fi
# If either the audio or CD driver is used, add the AudioUnit framework # If either the audio or CD driver is used, add the AudioUnit framework
if test x$enable_audio = xyes -o x$enable_cdrom = xyes; then if test x$enable_audio = xyes -o x$enable_cdrom = xyes; then
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework AudioToolbox -framework AudioUnit" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit"
fi fi
# Some subsystems reference IOKit... # Some subsystems reference IOKit...
if test x$need_iokit_framework = xyes; then if test x$need_iokit_framework = xyes; then
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework IOKit" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit"
fi fi
;; ;;
*-*-mint*) *-*-mint*)
...@@ -2854,10 +2854,10 @@ fi ...@@ -2854,10 +2854,10 @@ fi
case "$ARCH" in case "$ARCH" in
macosx) macosx)
if test x$enable_video = xyes -a x$enable_video_cocoa = xyes; then if test x$enable_video = xyes -a x$enable_video_cocoa = xyes; then
SDL_LIBS="$SDL_LIBS -framework Cocoa" SDL_LIBS="$SDL_LIBS -Wl,-framework,Cocoa"
fi fi
if test x$enable_video = xyes -a x$enable_video_carbon = xyes; then if test x$enable_video = xyes -a x$enable_video_carbon = xyes; then
SDL_LIBS="$SDL_LIBS -framework Carbon" SDL_LIBS="$SDL_LIBS -Wl,-framework,Carbon"
fi fi
# Evil hack to allow static linking on Mac OS X # Evil hack to allow static linking on Mac OS X
SDL_STATIC_LIBS="\${libdir}/libSDLmain.a \${libdir}/libSDL.a $EXTRA_LDFLAGS" SDL_STATIC_LIBS="\${libdir}/libSDLmain.a \${libdir}/libSDL.a $EXTRA_LDFLAGS"
......
...@@ -28,7 +28,7 @@ case "$host" in ...@@ -28,7 +28,7 @@ case "$host" in
*-*-darwin* ) *-*-darwin* )
EXE="" EXE=""
MATHLIB="" MATHLIB=""
SYS_GL_LIBS="-framework OpenGL" SYS_GL_LIBS="-Wl,-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