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.53 by gbeauche, 2006-07-06T00:07:47Z vs.
Revision 1.62 by asvitkine, 2008-11-21T01:09:28Z

# Line 106 | Line 106 | if [[ "x$WANT_MON" = "xyes" ]]; then
106    if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then
107      AC_MSG_RESULT(yes)
108      AC_DEFINE(ENABLE_MON, 1, [Define if using "mon".])
109 <    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"
109 >    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"
110      CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
111      AC_CHECK_LIB(ncurses, tgetent, ,
112        AC_CHECK_LIB(termcap, tgetent, ,
# Line 245 | Line 245 | dnl We use GTK+ if possible.
245   UISRCS=../dummy/prefs_editor_dummy.cpp
246   case "x$WANT_GTK" in
247   xgtk2*)
248 +  WANT_GTK=no
249    AM_PATH_GTK_2_0(1.3.15, [
250      GUI_CFLAGS="$GTK_CFLAGS"
251      GUI_LIBS="$GTK_LIBS"
# Line 258 | Line 259 | xgtk2*)
259      *)
260        AC_MSG_WARN([Could not find GTK+, disabling user interface.])
261        WANT_GTK=no
262 <      ;;
262 >     ;;
263      esac
264    ])
265    ;;
266   esac
267   if [[ "x$WANT_GTK" = "xgtk" ]]; then
268 +  WANT_GTK=no
269    AM_PATH_GTK(1.2.0, [
270      GUI_CFLAGS="$GTK_CFLAGS"
271      GUI_LIBS="$GTK_LIBS"
272 +    WANT_GTK=gtk
273    ], [
274      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
272 –    WANT_GTK=no
275    ])
276   fi
277   if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
# Line 290 | Line 292 | AC_SUBST(STANDALONE_GUI, [$WANT_STANDALO
292  
293   dnl We use ESD if possible.
294   if [[ "x$WANT_ESD" = "xyes" ]]; then
295 +  WANT_ESD=no
296    AM_PATH_ESD(0.2.8, [
297      AC_DEFINE(ENABLE_ESD, 1, [Define is using ESD.])
298      CFLAGS="$CFLAGS $ESD_CFLAGS"
299      CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
300      LIBS="$LIBS $ESD_LIBS"
301 +    WANT_ESD=yes
302    ], [
303      AC_MSG_WARN([Could not find ESD, disabling ESD support.])
300 –    WANT_ESD=no
304    ])
305   fi
306  
# Line 422 | 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 518 | Line 524 | dnl Check for some MacOS X frameworks
524   AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
525   AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
526   AC_CHECK_FRAMEWORK(CoreFoundation, [#include <CoreFoundation/CoreFoundation.h>])
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  
531   dnl Select system-dependant sources.
532   SERIALSRC=serial_unix.cpp
533   ETHERSRC=../dummy/ether_dummy.cpp
534   SCSISRC=../dummy/scsi_dummy.cpp
535   AUDIOSRC=../dummy/audio_dummy.cpp
536 + PREFSSRC=../dummy/prefs_dummy.cpp
537   EXTFSSRC=extfs_unix.cpp
538   EXTRASYSSRCS=
539   case "$target_os" in
# Line 553 | Line 563 | darwin*)
563      EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
564    fi
565    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
566 <    EXTFSSRC=../MacOSX/extfs_macosx.mm
566 >    EXTFSSRC=../MacOSX/extfs_macosx.cpp
567 >    PREFSSRC="../MacOSX/prefs_macosx.mm ../MacOSX/PrefsEditor/PrefsEditor.mm"
568 >    CPPFLAGS="$CPPFLAGS -I../MacOSX/PrefsEditor"
569 > fi
570 >  if [[ "x$ac_cv_framework_CoreAudio" = "xyes" ]]; then
571 >    AUDIOSRC="../MacOSX/audio_macosx.cpp ../MacOSX/AudioBackEnd.cpp ../MacOSX/AudioDevice.cpp ../MacOSX/MacOSX_sound_if.cpp"
572    fi
573    ;;
574   irix*)
# Line 616 | Line 631 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
631    AUDIOSRC="../SDL/audio_sdl.cpp"
632   fi
633  
634 < SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
634 > SYSSRCS="$VIDEOSRCS $EXTFSSRC $PREFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
635  
636   dnl Define a macro that translates a yesno-variable into a C macro definition
637   dnl to be put into the config.h file
# Line 1347 | Line 1362 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1362      ../kpx_cpu/src/cpu/ppc/ppc-cpu.cpp \
1363      ../kpx_cpu/src/cpu/ppc/ppc-decode.cpp \
1364      ../kpx_cpu/src/cpu/ppc/ppc-execute.cpp \
1365 <    ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp"
1365 >    ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp \
1366 >    ../kpx_cpu/src/utils/utils-cpuinfo.cpp"
1367    CPPFLAGS="$CPPFLAGS -I../kpx_cpu/include -I../kpx_cpu/src"
1368  
1369    dnl Enable JIT compiler, if possible
# Line 1440 | Line 1456 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1456        CPUSRCS="\
1457          ../kpx_cpu/src/cpu/jit/jit-cache.cpp \
1458          ../kpx_cpu/src/cpu/jit/basic-dyngen.cpp \
1459 <        ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp $CPUSRCS"
1459 >        ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp \
1460 >        ../kpx_cpu/src/cpu/ppc/ppc-jit.cpp $CPUSRCS"
1461      fi
1462    fi
1463    CPUSRCS="$CPUSRCS ../kpx_cpu/sheepshaver_glue.cpp"
1464   else
1465    WANT_JIT=no
1466   fi
1450 – if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then
1451 –  AC_CACHE_CHECK([whether static data regions are executable],
1452 –    ac_cv_have_static_data_exec, [
1453 –    AC_TRY_RUN([int main(void) {
1454 – #if defined(__powerpc__) || defined(__ppc__)
1455 –      static unsigned int p[8] = {0x4e800020,};
1456 –      asm volatile("dcbst 0,%0" : : "r" (p) : "memory");
1457 –      asm volatile("sync" : : : "memory");
1458 –      asm volatile("icbi 0,%0" : : "r" (p) : "memory");
1459 –      asm volatile("sync" : : : "memory");
1460 –      asm volatile("isync" : : : "memory");
1461 –      ((void (*)(void))p)();
1462 –      return 0;
1463 – #endif
1464 –      return 1;
1465 –    }], ac_cv_have_static_data_exec=yes, ac_cv_have_static_data_exec=no,
1466 –    dnl When cross-compiling, do not assume anything.
1467 –    ac_cv_have_static_data_exec=no
1468 –    )
1469 –  ])
1470 – else
1471 –  ac_cv_use_dyngen=no
1472 – fi
1473 – AC_TRANSLATE_DEFINE(HAVE_STATIC_DATA_EXEC, "$ac_cv_have_static_data_exec",
1474 –  [Define if your system marks static data pages as executable.])
1475 –
1467   if [[ "x$WANT_JIT" = "xyes" ]]; then
1468    CPPFLAGS="$CPPFLAGS -DUSE_JIT"
1469   fi

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines