comparison configure.in @ 935:f8d5ddc7aef1

Audio improvements from Max Horn, including a new CoreAudio driver for MacOSX
author Sam Lantinga <slouken@libsdl.org>
date Sat, 21 Aug 2004 02:06:30 +0000
parents 05c551e5bc64
children 84f930aebaeb
comparison
equal deleted inserted replaced
934:af585d6efec8 935:f8d5ddc7aef1
330 ],[ 330 ],[
331 ALport audio_port; 331 ALport audio_port;
332 ],[ 332 ],[
333 have_dmedia=yes 333 have_dmedia=yes
334 ]) 334 ])
335 AC_MSG_RESULT($have_dmedia)
335 # Set up files for the audio library 336 # Set up files for the audio library
336 if test x$have_dmedia = xyes; then 337 if test x$have_dmedia = xyes; then
337 CFLAGS="$CFLAGS -DDMEDIA_SUPPORT" 338 CFLAGS="$CFLAGS -DDMEDIA_SUPPORT"
338 AUDIO_SUBDIRS="$AUDIO_SUBDIRS dmedia" 339 AUDIO_SUBDIRS="$AUDIO_SUBDIRS dmedia"
339 AUDIO_DRIVERS="$AUDIO_DRIVERS dmedia/libaudio_dmedia.la" 340 AUDIO_DRIVERS="$AUDIO_DRIVERS dmedia/libaudio_dmedia.la"
483 if test x$have_mint_falcon_hdr = xyes; then 484 if test x$have_mint_falcon_hdr = xyes; then
484 mintaudio=yes 485 mintaudio=yes
485 CFLAGS="$CFLAGS -DMINTAUDIO_SUPPORT" 486 CFLAGS="$CFLAGS -DMINTAUDIO_SUPPORT"
486 AUDIO_SUBDIRS="$AUDIO_SUBDIRS mint" 487 AUDIO_SUBDIRS="$AUDIO_SUBDIRS mint"
487 AUDIO_DRIVERS="$AUDIO_DRIVERS mint/libaudio_mintaudio.la" 488 AUDIO_DRIVERS="$AUDIO_DRIVERS mint/libaudio_mintaudio.la"
489 fi
490 fi
491 }
492
493 dnl Check whether we want to use CoreAudio
494 CheckCoreAudio()
495 {
496 if test x$enable_audio = xyes; then
497 AC_MSG_CHECKING(for CoreAudio audio support)
498 have_coreaudio=no
499 AC_TRY_COMPILE([
500 #include <AudioUnit/AudioUnit.h>
501 ],[
502 AudioUnitInputCallback callback;
503 ],[
504 have_coreaudio=yes
505 ])
506 AC_MSG_RESULT($have_coreaudio)
507 # Set up files for the audio library
508 if test x$have_coreaudio = xyes; then
509 CFLAGS="$CFLAGS -DCOREAUDIO_SUPPORT"
510 AUDIO_SUBDIRS="$AUDIO_SUBDIRS macosx"
511 AUDIO_DRIVERS="$AUDIO_DRIVERS macosx/libaudio_macosx.la"
488 fi 512 fi
489 fi 513 fi
490 } 514 }
491 515
492 dnl See if we can use x86 assembly blitters 516 dnl See if we can use x86 assembly blitters
2505 # just the OS X kernel sans upper layers like Carbon and Cocoa. 2529 # just the OS X kernel sans upper layers like Carbon and Cocoa.
2506 # But config.guess comes back with "darwin", so go with the flow. 2530 # But config.guess comes back with "darwin", so go with the flow.
2507 ARCH=macosx 2531 ARCH=macosx
2508 CheckDummyVideo 2532 CheckDummyVideo
2509 CheckDiskAudio 2533 CheckDiskAudio
2534 CheckCoreAudio
2510 CheckQUARTZ 2535 CheckQUARTZ
2511 CheckMacGL 2536 CheckMacGL
2512 CheckPTHREAD 2537 CheckPTHREAD
2513 CheckSIGACTION 2538 CheckSIGACTION
2539 # If either the audio or CD driver is used, add the AudioUnit framework
2540 if test x$enable_audio = xyes -o x$enable_cdrom = xyes; then
2541 SYSTEM_LIBS="$SYSTEM_LIBS -framework AudioToolbox -framework AudioUnit"
2542 fi
2514 # Set up files for the audio library 2543 # Set up files for the audio library
2515 if test x$enable_audio = xyes; then 2544 if test x$enable_audio = xyes; then
2516 AUDIO_SUBDIRS="$AUDIO_SUBDIRS macrom" 2545 AUDIO_SUBDIRS="$AUDIO_SUBDIRS macrom"
2517 AUDIO_DRIVERS="$AUDIO_DRIVERS macrom/libaudio_macrom.la" 2546 AUDIO_DRIVERS="$AUDIO_DRIVERS macrom/libaudio_macrom.la"
2518 fi 2547 fi
2524 fi 2553 fi
2525 # Set up files for the cdrom library 2554 # Set up files for the cdrom library
2526 if test x$enable_cdrom = xyes; then 2555 if test x$enable_cdrom = xyes; then
2527 CDROM_SUBDIRS="$CDROM_SUBDIRS macosx" 2556 CDROM_SUBDIRS="$CDROM_SUBDIRS macosx"
2528 CDROM_DRIVERS="$CDROM_DRIVERS macosx/libcdrom_macosx.la" 2557 CDROM_DRIVERS="$CDROM_DRIVERS macosx/libcdrom_macosx.la"
2529 SYSTEM_LIBS="$SYSTEM_LIBS -framework AudioToolbox -framework AudioUnit -lstdc++" 2558 SYSTEM_LIBS="$SYSTEM_LIBS -lstdc++"
2530 fi 2559 fi
2531 # Set up files for the thread library 2560 # Set up files for the thread library
2532 if test x$enable_threads = xyes; then 2561 if test x$enable_threads = xyes; then
2533 CopyUnixThreadSource 2562 CopyUnixThreadSource
2534 fi 2563 fi
2764 src/audio/disk/Makefile 2793 src/audio/disk/Makefile
2765 src/audio/dma/Makefile 2794 src/audio/dma/Makefile
2766 src/audio/dmedia/Makefile 2795 src/audio/dmedia/Makefile
2767 src/audio/dsp/Makefile 2796 src/audio/dsp/Makefile
2768 src/audio/esd/Makefile 2797 src/audio/esd/Makefile
2798 src/audio/macosx/Makefile
2769 src/audio/macrom/Makefile 2799 src/audio/macrom/Makefile
2770 src/audio/mint/Makefile 2800 src/audio/mint/Makefile
2771 src/audio/mme/Makefile 2801 src/audio/mme/Makefile
2772 src/audio/nas/Makefile 2802 src/audio/nas/Makefile
2773 src/audio/nto/Makefile 2803 src/audio/nto/Makefile