Mercurial > sdl-ios-xcode
comparison configure.in @ 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 |
comparison
equal
deleted
inserted
replaced
3621:2fbe6995b2a2 | 3622:3e043c661dfc |
---|---|
1637 AC_DEFINE(SDL_VIDEO_OPENGL_CGL) | 1637 AC_DEFINE(SDL_VIDEO_OPENGL_CGL) |
1638 AC_DEFINE(SDL_VIDEO_RENDER_OGL) | 1638 AC_DEFINE(SDL_VIDEO_RENDER_OGL) |
1639 case "$host" in | 1639 case "$host" in |
1640 *-*-darwin*) | 1640 *-*-darwin*) |
1641 if test x$enable_video_cocoa = xyes; then | 1641 if test x$enable_video_cocoa = xyes; then |
1642 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,OpenGL" | 1642 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework OpenGL" |
1643 fi | 1643 fi |
1644 esac | 1644 esac |
1645 fi | 1645 fi |
1646 } | 1646 } |
1647 | 1647 |
2650 # Set up files for the haptic library | 2650 # Set up files for the haptic library |
2651 if test x$enable_haptic = xyes; then | 2651 if test x$enable_haptic = xyes; then |
2652 AC_DEFINE(SDL_HAPTIC_IOKIT) | 2652 AC_DEFINE(SDL_HAPTIC_IOKIT) |
2653 SOURCES="$SOURCES $srcdir/src/haptic/darwin/*.c" | 2653 SOURCES="$SOURCES $srcdir/src/haptic/darwin/*.c" |
2654 have_haptic=yes | 2654 have_haptic=yes |
2655 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,ForceFeedback" | 2655 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework ForceFeedback" |
2656 fi | 2656 fi |
2657 # Set up files for the power library | 2657 # Set up files for the power library |
2658 if test x$enable_power = xyes; then | 2658 if test x$enable_power = xyes; then |
2659 AC_DEFINE(SDL_POWER_MACOSX) | 2659 AC_DEFINE(SDL_POWER_MACOSX) |
2660 SOURCES="$SOURCES $srcdir/src/power/macosx/*.c" | 2660 SOURCES="$SOURCES $srcdir/src/power/macosx/*.c" |
2667 have_timers=yes | 2667 have_timers=yes |
2668 fi | 2668 fi |
2669 # The Mac OS X platform requires special setup. | 2669 # The Mac OS X platform requires special setup. |
2670 EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings" | 2670 EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings" |
2671 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lobjc" | 2671 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lobjc" |
2672 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Cocoa" | 2672 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework Cocoa" |
2673 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Carbon" | 2673 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework Carbon" |
2674 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit" | 2674 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework IOKit" |
2675 # If audio is used, add the AudioUnit framework | 2675 # If audio is used, add the AudioUnit framework |
2676 if test x$enable_audio = xyes; then | 2676 if test x$enable_audio = xyes; then |
2677 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreAudio -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit" | 2677 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -framework CoreAudio -framework AudioToolbox -framework AudioUnit" |
2678 fi | 2678 fi |
2679 ;; | 2679 ;; |
2680 *-riscos) | 2680 *-riscos) |
2681 ARCH=riscos | 2681 ARCH=riscos |
2682 CheckOSS | 2682 CheckOSS |