ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/SheepShaver/src/Unix/configure.ac
(Generate patch)

Comparing SheepShaver/src/Unix/configure.ac (file contents):
Revision 1.59 by gbeauche, 2007-06-13T16:34:13Z vs.
Revision 1.63 by asvitkine, 2009-02-11T19:22:16Z

# Line 425 | Line 425 | mips-sony-bsd|mips-sony-newsos4)
425   *-*-cygwin*)
426          no_dev_ptmx=1
427          ;;
428 + *-*-darwin*)
429 +        no_dev_ptmx=1
430 +        ;;
431   esac
432  
433   if test -z "$no_dev_ptmx" ; then
# Line 524 | Line 527 | AC_CHECK_FRAMEWORK(CoreFoundation, [#inc
527   AC_CHECK_FRAMEWORK(CoreAudio, [#include <CoreAudio/CoreAudio.h>])
528   AC_CHECK_FRAMEWORK(AudioUnit, [#include <AudioUnit/AudioUnit.h>])
529   AC_CHECK_FRAMEWORK(AudioToolbox, [#include <AudioToolbox/AudioToolbox.h>])
530 + AC_CHECK_FRAMEWORK(AppKit, [])
531  
532   dnl Select system-dependant sources.
533   SERIALSRC=serial_unix.cpp
534   ETHERSRC=../dummy/ether_dummy.cpp
535   SCSISRC=../dummy/scsi_dummy.cpp
536   AUDIOSRC=../dummy/audio_dummy.cpp
537 + PREFSSRC=../dummy/prefs_dummy.cpp
538   EXTFSSRC=extfs_unix.cpp
539   EXTRASYSSRCS=
540   case "$target_os" in
# Line 559 | Line 564 | darwin*)
564      EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
565    fi
566    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
567 <    EXTFSSRC=../MacOSX/extfs_macosx.mm
567 >    EXTFSSRC=../MacOSX/extfs_macosx.cpp
568 >    if [[ "x$ac_cv_framework_AppKit" = "xyes" ]]; then
569 >      PREFSSRC="../MacOSX/prefs_macosx.mm ../MacOSX/PrefsEditor/PrefsEditor.mm"
570 >      CPPFLAGS="$CPPFLAGS -I../MacOSX/PrefsEditor"
571 >    fi
572    fi
573 <  if [[ "x$ac_cv_framework_CoreAudio" = "xyes" ]]; then
573 >  if [[ "x$ac_cv_framework_CoreAudio" = "xyes" -a "x$WANT_SDL_AUDIO" = "xno" ]]; then
574      AUDIOSRC="../MacOSX/audio_macosx.cpp ../MacOSX/AudioBackEnd.cpp ../MacOSX/AudioDevice.cpp ../MacOSX/MacOSX_sound_if.cpp"
575    fi
576    ;;
# Line 625 | Line 634 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
634    AUDIOSRC="../SDL/audio_sdl.cpp"
635   fi
636  
637 < SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
637 > SYSSRCS="$VIDEOSRCS $EXTFSSRC $PREFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
638  
639   dnl Define a macro that translates a yesno-variable into a C macro definition
640   dnl to be put into the config.h file

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines