mirror of
https://github.com/joel16/SDL2.git
synced 2024-12-04 01:01:07 +00:00
Whoops, this breaks building on Mac OS X 10.4
--HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403874
This commit is contained in:
parent
ad397223a2
commit
a78ed924f8
12
configure.in
12
configure.in
@ -1644,7 +1644,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 -framework OpenGL"
|
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,OpenGL"
|
||||||
fi
|
fi
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
@ -2657,7 +2657,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 -framework ForceFeedback"
|
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-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
|
||||||
@ -2674,12 +2674,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 -framework Cocoa"
|
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Cocoa"
|
||||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework Carbon"
|
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Carbon"
|
||||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework IOKit"
|
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit"
|
||||||
# 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; then
|
if test x$enable_audio = xyes; then
|
||||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework CoreAudio -framework AudioToolbox -framework AudioUnit"
|
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreAudio -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
*-riscos)
|
*-riscos)
|
||||||
|
@ -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=""
|
||||||
|
Loading…
Reference in New Issue
Block a user