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.65 by asvitkine, 2009-03-18T16:09:15Z vs.
Revision 1.68 by asvitkine, 2010-10-06T00:34:15Z

# Line 41 | Line 41 | AC_ARG_WITH(gtk,            [  --with-gt
41   AC_ARG_WITH(mon,            [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
42   AC_ARG_WITH(dgcc,           [  --with-dgcc=COMPILER    use C++ COMPILER to compile synthetic opcodes], [DYNGEN_CC=$withval])
43  
44 + AC_ARG_WITH(bincue,  
45 +  AS_HELP_STRING([--with-bincue], [Allow cdrom image files in bin/cue mode]))
46 +
47 +
48   dnl Addressing mode
49   AC_ARG_ENABLE(addressing,
50    [  --enable-addressing=AM  set the addressing mode to use [default=real]],
# Line 111 | Line 115 | if [[ "x$WANT_MON" = "xyes" ]]; then
115      MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_z80.cpp $mon_srcdir/mon_cmd.cpp $mon_srcdir/mon_lowmem.cpp $mon_srcdir/mon_disass.cpp $mon_srcdir/mon_ppc.cpp $mon_srcdir/disass/floatformat.c $mon_srcdir/disass/i386-dis.c $mon_srcdir/disass/m68k-dis.c $mon_srcdir/disass/m68k-opc.c $mon_srcdir/disass/mips-dis.c $mon_srcdir/disass/mips-opc.c $mon_srcdir/disass/mips16-opc.c"
116      CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
117      AC_CHECK_LIB(ncurses, tgetent, ,
118 <      AC_CHECK_LIB(termcap, tgetent, ,
119 <        AC_CHECK_LIB(termlib, tgetent, ,
120 <          AC_CHECK_LIB(terminfo, tgetent, ,
121 <            AC_CHECK_LIB(Hcurses, tgetent, ,
122 <              AC_CHECK_LIB(curses, tgetent))))))
118 >      [AC_CHECK_LIB(termcap, tgetent, ,
119 >        [AC_CHECK_LIB(termlib, tgetent, ,
120 >          [AC_CHECK_LIB(terminfo, tgetent, ,
121 >            [AC_CHECK_LIB(Hcurses, tgetent, ,
122 >              [AC_CHECK_LIB(curses, tgetent)])])])])])
123      AC_CHECK_LIB(readline, readline)
124      AC_CHECK_HEADERS(readline.h history.h readline/readline.h readline/history.h)
125    else
# Line 213 | Line 217 | if [[ "x$WANT_SDL_VIDEO" != "xyes" ]]; t
217    LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
218   fi
219  
220 +
221 +
222   dnl We need pthreads on non-PowerPC systems. Try libpthread first, then libc_r (FreeBSD), then PTL.
223   HAVE_PTHREADS=yes
224   case $EMULATED_PPC:$target_os in
# Line 605 | Line 611 | darwin*)
611    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
612      EXTFSSRC=../MacOSX/extfs_macosx.cpp
613      if [[ "x$ac_cv_framework_AppKit" = "xyes" -a "x$WANT_GTK" = "xno" ]]; then
614 <      PREFSSRC="../MacOSX/prefs_macosx.mm ../MacOSX/PrefsEditor/PrefsEditor.mm"
615 <      CPPFLAGS="$CPPFLAGS -I../MacOSX/PrefsEditor"
614 >      PREFSSRC="../MacOSX/prefs_macosx.mm ../MacOSX/Launcher/VMSettingsController.mm"
615 >      CPPFLAGS="$CPPFLAGS -I../MacOSX/Launcher"
616      fi
617    fi
618    if [[ "x$WANT_ESD" = "xno" -a "x$ac_cv_framework_CoreAudio" = "xyes" -a "x$WANT_SDL_AUDIO" = "xno" ]]; then
619      AUDIOSRC="../MacOSX/audio_macosx.cpp ../MacOSX/AudioBackEnd.cpp ../MacOSX/AudioDevice.cpp ../MacOSX/MacOSX_sound_if.cpp"
620 +    OSX_CORE_AUDIO="-DOSX_CORE_AUDIO"
621    fi
622    ;;
623   irix*)
# Line 631 | Line 638 | irix*)
638    ;;
639   esac
640  
641 + dnl BINCUE
642 + AS_IF([test  "x$with_bincue" = "xyes" ], [have_bincue=yes], [have_bincue=no])
643 + AS_IF([test  "x$have_bincue" = "xyes" ], [
644 +   if [[ "xOSX_CORE_AUDIO" = "xno"  -a "x$WANT_SDL_AUDIO"="xno"]]; then
645 +       AC_MSG_ERROR([You need SDL or OSX Core Audio to use BINCUE support.])
646 +   else
647 +       CPPFLAGS="$CPPFLAGS -DBINCUE $OSX_CORE_AUDIO"
648 +   fi
649 + ])
650 +
651 +
652   dnl Is the slirp library supported?
653   case "$ac_cv_have_byte_bitfields" in
654   yes|"guessing yes")
# Line 676 | Line 694 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
694    AUDIOSRC="../SDL/audio_sdl.cpp"
695   fi
696  
697 + dnl BINCUE overrides
698 +
699 + if [[ "x$have_bincue" = "xyes" ]]; then
700 +  EXTRASYSSRCS="$EXTRASYSSRCS bincue_unix.cpp"
701 + fi
702 +
703 +
704   SYSSRCS="$VIDEOSRCS $EXTFSSRC $PREFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
705  
706   dnl Define a macro that translates a yesno-variable into a C macro definition
# Line 1576 | Line 1601 | echo
1601   echo SheepShaver configuration summary:
1602   echo
1603   echo SDL support ...................... : $SDL_SUPPORT
1604 + echo BINCUE support ................... : $have_bincue
1605   echo FBDev DGA support ................ : $WANT_FBDEV_DGA
1606   echo XFree86 DGA support .............. : $WANT_XF86_DGA
1607   echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines