configure.in
changeset 1910 c26194009c9c
parent 1895 c121d94672cb
child 1931 103c6fec2a60
equal deleted inserted replaced
1909:8f1ab2f7c722 1910:c26194009c9c
  2492             have_timers=yes
  2492             have_timers=yes
  2493         fi
  2493         fi
  2494         # The Mac OS X platform requires special setup.
  2494         # The Mac OS X platform requires special setup.
  2495         SDLMAIN_SOURCES="$srcdir/src/main/macosx/*.m"
  2495         SDLMAIN_SOURCES="$srcdir/src/main/macosx/*.m"
  2496         EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings"
  2496         EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings"
       
  2497         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Cocoa"
       
  2498         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Carbon"
  2497         SDL_LIBS="-lSDLmain $SDL_LIBS"
  2499         SDL_LIBS="-lSDLmain $SDL_LIBS"
  2498         if test x$enable_video_cocoa = xyes; then
       
  2499             EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Cocoa"
       
  2500         fi
       
  2501         if test x$enable_video_carbon = xyes -o x$enable_video_cocoa = xyes; then
       
  2502             # The Cocoa backend still needs Carbon, and the YUV code QuickTime
       
  2503             EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,QuickTime -Wl,-framework,ApplicationServices"
       
  2504             EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Carbon"
       
  2505         fi
       
  2506         # If either the audio or CD driver is used, add the AudioUnit framework
  2500         # If either the audio or CD driver is used, add the AudioUnit framework
  2507         if test x$enable_audio = xyes -o x$enable_cdrom = xyes; then
  2501         if test x$enable_audio = xyes -o x$enable_cdrom = xyes; then
  2508             EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit"
  2502             EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit"
  2509         fi
  2503         fi
  2510         ;;
  2504         ;;
  2645   SDL_RLD_FLAGS=""
  2639   SDL_RLD_FLAGS=""
  2646 fi
  2640 fi
  2647 
  2641 
  2648 case "$ARCH" in
  2642 case "$ARCH" in
  2649   macosx)
  2643   macosx)
  2650     if test x$enable_video = xyes -a x$enable_video_cocoa = xyes; then
  2644     SDL_LIBS="$SDL_LIBS -Wl,-framework,Cocoa"
  2651       SDL_LIBS="$SDL_LIBS -Wl,-framework,Cocoa"
  2645     # Is this still needed?
  2652     fi
  2646     #if test x$enable_video = xyes -a x$enable_video_carbon = xyes; then
  2653     if test x$enable_video = xyes -a x$enable_video_carbon = xyes; then
  2647     #  SDL_LIBS="$SDL_LIBS -Wl,-framework,Carbon"
  2654       SDL_LIBS="$SDL_LIBS -Wl,-framework,Carbon"
  2648     #fi
  2655     fi
       
  2656     # Evil hack to allow static linking on Mac OS X
  2649     # Evil hack to allow static linking on Mac OS X
  2657     SDL_STATIC_LIBS="\${exec_prefix}/lib/libSDLmain.a \${exec_prefix}/lib/libSDL.a $EXTRA_LDFLAGS"
  2650     SDL_STATIC_LIBS="\${exec_prefix}/lib/libSDLmain.a \${exec_prefix}/lib/libSDL.a $EXTRA_LDFLAGS"
  2658     ;;
  2651     ;;
  2659   *)
  2652   *)
  2660     SDL_STATIC_LIBS="$SDL_LIBS"
  2653     SDL_STATIC_LIBS="$SDL_LIBS"