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.67 by asvitkine, 2010-03-07T00:44:05Z vs.
Revision 1.74 by asvitkine, 2012-06-16T02:16:40Z

# Line 5 | Line 5 | AC_INIT([SheepShaver], 2.3, [Christian.B
5   AC_CONFIG_SRCDIR(main_unix.cpp)
6   AC_PREREQ(2.52)
7   AC_CONFIG_HEADER(config.h)
8 + AH_TOP(
9 + #ifndef CONFIG_H
10 + #define CONFIG_H
11 + )
12 + AH_BOTTOM(
13 + #endif /* CONFIG_H */
14 + )
15  
16   dnl Canonical system information.
17   AC_CANONICAL_HOST
# Line 41 | Line 48 | AC_ARG_WITH(gtk,            [  --with-gt
48   AC_ARG_WITH(mon,            [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
49   AC_ARG_WITH(dgcc,           [  --with-dgcc=COMPILER    use C++ COMPILER to compile synthetic opcodes], [DYNGEN_CC=$withval])
50  
51 + AC_ARG_WITH(bincue,  
52 +  AS_HELP_STRING([--with-bincue], [Allow cdrom image files in bin/cue mode]))
53 +
54 + AC_ARG_WITH(libvhd,  
55 +  AS_HELP_STRING([--with-libvhd], [Enable VHD disk images]))
56 +
57 +
58   dnl Addressing mode
59   AC_ARG_ENABLE(addressing,
60    [  --enable-addressing=AM  set the addressing mode to use [default=real]],
# Line 213 | Line 227 | if [[ "x$WANT_SDL_VIDEO" != "xyes" ]]; t
227    LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
228   fi
229  
230 +
231 +
232   dnl We need pthreads on non-PowerPC systems. Try libpthread first, then libc_r (FreeBSD), then PTL.
233   HAVE_PTHREADS=yes
234   case $EMULATED_PPC:$target_os in
# Line 354 | Line 370 | AC_CHECK_HEADERS(mach/vm_map.h mach/mach
370   AC_CHECK_HEADERS(unistd.h fcntl.h byteswap.h dirent.h)
371   AC_CHECK_HEADERS(sys/socket.h sys/ioctl.h sys/filio.h sys/bitypes.h sys/wait.h)
372   AC_CHECK_HEADERS(sys/time.h sys/poll.h sys/select.h arpa/inet.h)
373 < AC_CHECK_HEADERS(linux/if.h linux/if_tun.h net/if.h net/if_tun.h, [], [], [
373 > AC_CHECK_HEADERS(netinet/in.h linux/if.h linux/if_tun.h net/if.h net/if_tun.h, [], [], [
374   #ifdef HAVE_SYS_TYPES_H
375   #include <sys/types.h>
376   #endif
# Line 611 | Line 627 | darwin*)
627    fi
628    if [[ "x$WANT_ESD" = "xno" -a "x$ac_cv_framework_CoreAudio" = "xyes" -a "x$WANT_SDL_AUDIO" = "xno" ]]; then
629      AUDIOSRC="../MacOSX/audio_macosx.cpp ../MacOSX/AudioBackEnd.cpp ../MacOSX/AudioDevice.cpp ../MacOSX/MacOSX_sound_if.cpp"
630 +    OSX_CORE_AUDIO="-DOSX_CORE_AUDIO"
631    fi
632    ;;
633   irix*)
# Line 631 | Line 648 | irix*)
648    ;;
649   esac
650  
651 + dnl BINCUE
652 + AS_IF([test  "x$with_bincue" = "xyes" ], [have_bincue=yes], [have_bincue=no])
653 + AS_IF([test  "x$have_bincue" = "xyes" ], [
654 +   if [[ "xOSX_CORE_AUDIO" = "xno"  -a "x$WANT_SDL_AUDIO"="xno"]]; then
655 +       AC_MSG_ERROR([You need SDL or OSX Core Audio to use BINCUE support.])
656 +   else
657 +       CPPFLAGS="$CPPFLAGS -DBINCUE $OSX_CORE_AUDIO"
658 +   fi
659 + ])
660 +
661 + dnl LIBVHD
662 + AS_IF([test  "x$with_libvhd" = "xyes" ], [have_libvhd=yes], [have_libvhd=no])
663 + AS_IF([test  "x$have_libvhd" = "xyes" ], [
664 +       CPPFLAGS="$CPPFLAGS -DHAVE_LIBVHD"
665 +           LIBS="$LIBS -lvhd"
666 +           case $target_os in
667 +           linux*)
668 +           LIBS="$LIBS -luuid"
669 +           esac
670 +           AC_CHECK_LIB(vhd, vhd_open)
671 +           AC_CHECK_LIB(vhd, vhd_io_read)
672 +           AC_CHECK_LIB(vhd, vhd_io_write)
673 +           AC_CHECK_LIB(vhd, vhd_close)
674 + ])
675 +
676 +
677 +
678 +
679   dnl Is the slirp library supported?
680   case "$ac_cv_have_byte_bitfields" in
681   yes|"guessing yes")
# Line 663 | Line 708 | if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; th
708    KEYCODES="../SDL/keycodes"
709    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
710      EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/clip_macosx.cpp"
711 +    EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/utils_macosx.mm"
712 +    CPPFLAGS="$CPPFLAGS -I../MacOSX"
713    else
714      EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
715    fi
# Line 676 | Line 723 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
723    AUDIOSRC="../SDL/audio_sdl.cpp"
724   fi
725  
726 + dnl BINCUE overrides
727 +
728 + if [[ "x$have_bincue" = "xyes" ]]; then
729 +  EXTRASYSSRCS="$EXTRASYSSRCS bincue_unix.cpp"
730 + fi
731 +
732 + dnl libvhd overrides
733 +
734 + if [[ "x$have_libvhd" = "xyes" ]]; then
735 +  EXTRASYSSRCS="$EXTRASYSSRCS vhd_unix.cpp"
736 + fi
737 +
738 +
739   SYSSRCS="$VIDEOSRCS $EXTFSSRC $PREFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
740  
741   dnl Define a macro that translates a yesno-variable into a C macro definition
# Line 693 | Line 753 | dnl Check that the host supports TUN/TAP
753   AC_CACHE_CHECK([whether TUN/TAP is supported],
754    ac_cv_tun_tap_support, [
755    AC_TRY_COMPILE([
756 +        #if defined(HAVE_NETINET_IN_H)
757 +        #include <netinet/in.h>
758 +        #endif
759      #if defined(HAVE_LINUX_IF_H) && defined(HAVE_LINUX_IF_TUN_H)
760      #include <linux/if.h>
761      #include <linux/if_tun.h>
# Line 1431 | Line 1494 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1494        powerpc:mach)
1495          ac_cv_use_dyngen=yes
1496          ;;
1497 +      x86_64:mach)
1498 +        ac_cv_use_dyngen=yes
1499 +        ;;
1500        i?86:mach)
1501          ac_cv_use_dyngen=yes
1502          ;;
# Line 1505 | Line 1571 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1571          ../kpx_cpu/src/cpu/ppc/ppc-jit.cpp $CPUSRCS"
1572      fi
1573    fi
1574 <  CPUSRCS="$CPUSRCS ../kpx_cpu/sheepshaver_glue.cpp"
1574 >  CPUSRCS="$CPUSRCS ../kpx_cpu/sheepshaver_glue.cpp ../kpx_cpu/ppc-dis.c"
1575   else
1576    WANT_JIT=no
1577   fi
# Line 1576 | Line 1642 | echo
1642   echo SheepShaver configuration summary:
1643   echo
1644   echo SDL support ...................... : $SDL_SUPPORT
1645 + echo BINCUE support ................... : $have_bincue
1646 + echo LIBVHD support ................... : $have_libvhd
1647   echo FBDev DGA support ................ : $WANT_FBDEV_DGA
1648   echo XFree86 DGA support .............. : $WANT_XF86_DGA
1649   echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines