Fixed building on Mac OS X without the Carbon and Cocoa video drivers
authorSam Lantinga
Sun, 16 Jul 2006 03:32:06 +0000
changeset 1910c26194009c9c
parent 1909 8f1ab2f7c722
child 1911 7577fd11cee4
Fixed building on Mac OS X without the Carbon and Cocoa video drivers
configure.in
     1.1 --- a/configure.in	Sat Jul 15 19:30:18 2006 +0000
     1.2 +++ b/configure.in	Sun Jul 16 03:32:06 2006 +0000
     1.3 @@ -2494,15 +2494,9 @@
     1.4          # The Mac OS X platform requires special setup.
     1.5          SDLMAIN_SOURCES="$srcdir/src/main/macosx/*.m"
     1.6          EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings"
     1.7 +        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Cocoa"
     1.8 +        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Carbon"
     1.9          SDL_LIBS="-lSDLmain $SDL_LIBS"
    1.10 -        if test x$enable_video_cocoa = xyes; then
    1.11 -            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Cocoa"
    1.12 -        fi
    1.13 -        if test x$enable_video_carbon = xyes -o x$enable_video_cocoa = xyes; then
    1.14 -            # The Cocoa backend still needs Carbon, and the YUV code QuickTime
    1.15 -            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,QuickTime -Wl,-framework,ApplicationServices"
    1.16 -            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Carbon"
    1.17 -        fi
    1.18          # If either the audio or CD driver is used, add the AudioUnit framework
    1.19          if test x$enable_audio = xyes -o x$enable_cdrom = xyes; then
    1.20              EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit"
    1.21 @@ -2647,12 +2641,11 @@
    1.22  
    1.23  case "$ARCH" in
    1.24    macosx)
    1.25 -    if test x$enable_video = xyes -a x$enable_video_cocoa = xyes; then
    1.26 -      SDL_LIBS="$SDL_LIBS -Wl,-framework,Cocoa"
    1.27 -    fi
    1.28 -    if test x$enable_video = xyes -a x$enable_video_carbon = xyes; then
    1.29 -      SDL_LIBS="$SDL_LIBS -Wl,-framework,Carbon"
    1.30 -    fi
    1.31 +    SDL_LIBS="$SDL_LIBS -Wl,-framework,Cocoa"
    1.32 +    # Is this still needed?
    1.33 +    #if test x$enable_video = xyes -a x$enable_video_carbon = xyes; then
    1.34 +    #  SDL_LIBS="$SDL_LIBS -Wl,-framework,Carbon"
    1.35 +    #fi
    1.36      # Evil hack to allow static linking on Mac OS X
    1.37      SDL_STATIC_LIBS="\${exec_prefix}/lib/libSDLmain.a \${exec_prefix}/lib/libSDL.a $EXTRA_LDFLAGS"
    1.38      ;;