--- SheepShaver/src/Unix/configure.ac 2005/07/01 06:16:00 1.31 +++ SheepShaver/src/Unix/configure.ac 2012/06/15 23:00:24 1.73 @@ -1,10 +1,17 @@ dnl Process this file with autoconf to produce a configure script. dnl Written in 2002 by Christian Bauer -AC_INIT([SheepShaver], 2.2, [Christian.Bauer@uni-mainz.de], SheepShaver) +AC_INIT([SheepShaver], 2.3, [Christian.Bauer@uni-mainz.de], SheepShaver) AC_CONFIG_SRCDIR(main_unix.cpp) AC_PREREQ(2.52) AC_CONFIG_HEADER(config.h) +AH_TOP( +#ifndef CONFIG_H +#define CONFIG_H +) +AH_BOTTOM( +#endif /* CONFIG_H */ +) dnl Canonical system information. AC_CANONICAL_HOST @@ -14,6 +21,13 @@ dnl Some systems do not put corefiles in dnl cores for the configure tests since some are intended to dump core. ulimit -c 0 +dnl Invite Cygwin users to build within the Windows/ directory +case $target_os in +*cygwin* | *mingw32*) + AC_MSG_ERROR([You can only build the Windows version from its directory, Cygwin/X11 is not supported.]) + ;; +esac + dnl Options. AC_ARG_ENABLE(jit, [ --enable-jit enable JIT compiler [default=yes]], [WANT_JIT=$enableval], [WANT_JIT=yes]) AC_ARG_ENABLE(ppc-emulator, [ --enable-ppc-emulator use the selected PowerPC emulator [default=auto]], [WANT_EMULATED_PPC=$enableval], [WANT_EMULATED_PPC=auto]) @@ -21,6 +35,7 @@ AC_ARG_ENABLE(fbdev-dga, [ --enable- AC_ARG_ENABLE(xf86-dga, [ --enable-xf86-dga use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes]) AC_ARG_ENABLE(xf86-vidmode, [ --enable-xf86-vidmode use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes]) AC_ARG_ENABLE(vosf, [ --enable-vosf enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes]) +AC_ARG_ENABLE(standalone-gui,[ --enable-standalone-gui enable a standalone GUI prefs editor [default=no]], [WANT_STANDALONE_GUI=$enableval], [WANT_STANDALONE_GUI=no]) AC_ARG_WITH(esd, [ --with-esd support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes]) AC_ARG_WITH(gtk, [ --with-gtk use GTK user interface [default=yes]], [case "$withval" in @@ -33,6 +48,13 @@ AC_ARG_WITH(gtk, [ --with-gt AC_ARG_WITH(mon, [ --with-mon use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes]) AC_ARG_WITH(dgcc, [ --with-dgcc=COMPILER use C++ COMPILER to compile synthetic opcodes], [DYNGEN_CC=$withval]) +AC_ARG_WITH(bincue, + AS_HELP_STRING([--with-bincue], [Allow cdrom image files in bin/cue mode])) + +AC_ARG_WITH(libvhd, + AS_HELP_STRING([--with-libvhd], [Enable VHD disk images])) + + dnl Addressing mode AC_ARG_ENABLE(addressing, [ --enable-addressing=AM set the addressing mode to use [default=real]], @@ -48,6 +70,8 @@ dnl SDL options. AC_ARG_ENABLE(sdl-static, [ --enable-sdl-static use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no]) AC_ARG_ENABLE(sdl-video, [ --enable-sdl-video use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no]) AC_ARG_ENABLE(sdl-audio, [ --enable-sdl-audio use SDL for audio [default=no]], [WANT_SDL_AUDIO=$enableval], [WANT_SDL_AUDIO=no]) +AC_ARG_ENABLE(sdl-framework, [ --enable-sdl-framework use SDL framework [default=no]], [WANT_SDL_FRAMEWORK=$enableval], [WANT_SDL_FRAMEWORK=no]) +AC_ARG_ENABLE(sdl-framework-prefix, [ --enable-sdl-framework-prefix=PFX default=/Library/Frameworks], [SDL_FRAMEWORK="$enableval"], [SDL_FRAMEWORK=/Library/Frameworks]) dnl Checks for programs. AC_PROG_CC @@ -98,14 +122,14 @@ if [[ "x$WANT_MON" = "xyes" ]]; then if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then AC_MSG_RESULT(yes) AC_DEFINE(ENABLE_MON, 1, [Define if using "mon".]) - 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" + 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" CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass" AC_CHECK_LIB(ncurses, tgetent, , - AC_CHECK_LIB(termcap, tgetent, , - AC_CHECK_LIB(termlib, tgetent, , - AC_CHECK_LIB(terminfo, tgetent, , - AC_CHECK_LIB(Hcurses, tgetent, , - AC_CHECK_LIB(curses, tgetent)))))) + [AC_CHECK_LIB(termcap, tgetent, , + [AC_CHECK_LIB(termlib, tgetent, , + [AC_CHECK_LIB(terminfo, tgetent, , + [AC_CHECK_LIB(Hcurses, tgetent, , + [AC_CHECK_LIB(curses, tgetent)])])])])]) AC_CHECK_LIB(readline, readline) AC_CHECK_HEADERS(readline.h history.h readline/readline.h readline/history.h) else @@ -118,6 +142,37 @@ AC_SUBST(MONSRCS) dnl Checks for libraries. AC_CHECK_LIB(posix4, sem_init) +AC_CHECK_LIB(m, cos) + +dnl AC_CHECK_SDLFRAMEWORK($1=NAME, $2=INCLUDES) +dnl AC_TRY_LINK uses main() but SDL needs main to take args, +dnl therefore main is undefined with #undef. +dnl Framework can be in an custom location. +AC_DEFUN([AC_CHECK_SDLFRAMEWORK], [ + AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1]) + AC_CACHE_CHECK([whether compiler supports framework $1], + ac_Framework, [ + saved_LIBS="$LIBS" + LIBS="$LIBS -framework $1" + if [[ "x$SDL_FRAMEWORK" != "x/Library/Frameworks" ]]; then + if [[ "x$SDL_FRAMEWORK" != "x/System/Library/Frameworks" ]]; then + LIBS="$saved_LIBS -F$SDL_FRAMEWORK -framework $1" + fi + fi + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$SDL_FRAMEWORK/SDL.framework/Headers" + AC_TRY_LINK( + [$2 +#undef main], [], + [AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no); +LIBS="$saved_LIBS"; CPPFLAGS="$saved_CPPFLAGS"] + ) + ]) + AS_IF([test AS_VAR_GET(ac_Framework) = yes], + [AC_DEFINE(AS_TR_CPP(HAVE_FRAMEWORK_$1), 1, [Define if framework $1 is available.])] + ) + AS_VAR_POPDEF([ac_Framework]) +]) dnl Do we need SDL? WANT_SDL=no @@ -133,30 +188,28 @@ if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th SDL_SUPPORT="$SDL_SUPPORT audio" fi if [[ "x$WANT_SDL" = "xyes" ]]; then - AC_PATH_PROG(sdl_config, "sdl-config") - if [[ -n "$sdl_config" ]]; then - case $target_os in - # Special treatment for Cygwin so that we can still use the POSIX layer - *cygwin*) - sdl_cflags="-I`$sdl_config --prefix`/include/SDL" - sdl_libs="-L`$sdl_config --exec-prefix`/lib -lSDL" - ;; - *) + if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then + AC_CHECK_SDLFRAMEWORK(SDL, [#include ]) + else + ac_cv_framework_SDL=no + fi + if [[ "x$ac_cv_framework_SDL" = "xno" ]]; then + AC_PATH_PROG(sdl_config, "sdl-config") + if [[ -n "$sdl_config" ]]; then sdl_cflags=`$sdl_config --cflags` if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then sdl_libs=`$sdl_config --static-libs` else sdl_libs=`$sdl_config --libs` fi - ;; - esac - CFLAGS="$CFLAGS $sdl_cflags" - CXXFLAGS="$CXXFLAGS $sdl_cflags" - LIBS="$LIBS $sdl_libs" - else - WANT_SDL=no - WANT_SDL_VIDEO=no - WANT_SDL_AUDIO=no + CFLAGS="$CFLAGS $sdl_cflags" + CXXFLAGS="$CXXFLAGS $sdl_cflags" + LIBS="$LIBS $sdl_libs" + else + WANT_SDL=no + WANT_SDL_VIDEO=no + WANT_SDL_AUDIO=no + fi fi SDL_SUPPORT=`echo "$SDL_SUPPORT" | sed -e "s/^ //"` else @@ -174,6 +227,8 @@ if [[ "x$WANT_SDL_VIDEO" != "xyes" ]]; t LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS" fi + + dnl We need pthreads on non-PowerPC systems. Try libpthread first, then libc_r (FreeBSD), then PTL. HAVE_PTHREADS=yes case $EMULATED_PPC:$target_os in @@ -192,7 +247,7 @@ no:linux*|no:netbsd*) ]) ]) AC_CHECK_FUNCS(pthread_cancel) - AC_CHECK_FUNCS(pthread_cond_init) + AC_CHECK_FUNCS(pthread_cond_init pthread_testcancel) AC_CHECK_FUNCS(pthread_mutexattr_setprotocol) AC_CHECK_FUNCS(pthread_mutexattr_settype) AC_CHECK_FUNCS(pthread_mutexattr_setpshared) @@ -245,12 +300,10 @@ dnl We use GTK+ if possible. UISRCS=../dummy/prefs_editor_dummy.cpp case "x$WANT_GTK" in xgtk2*) + WANT_GTK=no AM_PATH_GTK_2_0(1.3.15, [ - AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.]) - CFLAGS="$CFLAGS $GTK_CFLAGS" - CXXFLAGS="$CXXFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - UISRCS=prefs_editor_gtk.cpp + GUI_CFLAGS="$GTK_CFLAGS" + GUI_LIBS="$GTK_LIBS" WANT_GTK=gtk2 ], [ case "x${WANT_GTK}x" in @@ -261,34 +314,48 @@ xgtk2*) *) AC_MSG_WARN([Could not find GTK+, disabling user interface.]) WANT_GTK=no - ;; + ;; esac ]) ;; esac if [[ "x$WANT_GTK" = "xgtk" ]]; then + WANT_GTK=no AM_PATH_GTK(1.2.0, [ - AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.]) - CFLAGS="$CFLAGS $GTK_CFLAGS" - CXXFLAGS="$CXXFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - UISRCS=prefs_editor_gtk.cpp + GUI_CFLAGS="$GTK_CFLAGS" + GUI_LIBS="$GTK_LIBS" + WANT_GTK=gtk ], [ AC_MSG_WARN([Could not find GTK+, disabling user interface.]) - WANT_GTK=no ]) fi +if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then + AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.]) + UISRCS=prefs_editor_gtk.cpp +fi +AC_SUBST(GUI_CFLAGS) +AC_SUBST(GUI_LIBS) + +dnl Build external GUI if requested. +if [[ "$WANT_STANDALONE_GUI" != "yes" ]]; then + WANT_STANDALONE_GUI=no +fi +if [[ "$WANT_GTK" = "no" ]]; then + WANT_STANDALONE_GUI=no +fi +AC_SUBST(STANDALONE_GUI, [$WANT_STANDALONE_GUI]) dnl We use ESD if possible. if [[ "x$WANT_ESD" = "xyes" ]]; then + WANT_ESD=no AM_PATH_ESD(0.2.8, [ AC_DEFINE(ENABLE_ESD, 1, [Define is using ESD.]) CFLAGS="$CFLAGS $ESD_CFLAGS" CXXFLAGS="$CXXFLAGS $ESD_CFLAGS" LIBS="$LIBS $ESD_LIBS" + WANT_ESD=yes ], [ AC_MSG_WARN([Could not find ESD, disabling ESD support.]) - WANT_ESD=no ]) fi @@ -300,14 +367,19 @@ AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_CHECK_HEADERS(malloc.h stdint.h) AC_CHECK_HEADERS(mach/vm_map.h mach/mach_init.h sys/mman.h) -AC_CHECK_HEADERS(sys/time.h sys/times.h sys/socket.h) AC_CHECK_HEADERS(unistd.h fcntl.h byteswap.h dirent.h) -AC_CHECK_HEADERS(linux/if.h, [], [], [ -#if HAVE_SYS_SOCKET_H -# include +AC_CHECK_HEADERS(sys/socket.h sys/ioctl.h sys/filio.h sys/bitypes.h sys/wait.h) +AC_CHECK_HEADERS(sys/time.h sys/poll.h sys/select.h arpa/inet.h) +AC_CHECK_HEADERS(netinet/in.h linux/if.h linux/if_tun.h net/if.h net/if_tun.h, [], [], [ +#ifdef HAVE_SYS_TYPES_H +#include +#endif +#ifdef HAVE_SYS_SOCKET_H +#include #endif ]) -AC_CHECK_HEADERS(linux/if_tun.h net/if.h net/if_tun.h) +AC_CHECK_HEADERS(AvailabilityMacros.h) +AC_CHECK_HEADERS(IOKit/storage/IOBlockStorageDevice.h) AC_CHECK_HEADERS(fenv.h) dnl Checks for typedefs, structures, and compiler characteristics. @@ -328,6 +400,23 @@ AC_TYPE_SIGNAL AC_HEADER_TIME AC_STRUCT_TM +dnl Check whether sys/socket.h defines type socklen_t. +dnl (extracted from ac-archive/Miscellaneous) +AC_CACHE_CHECK([for socklen_t], + ac_cv_type_socklen_t, [ + AC_TRY_COMPILE([ + #include + #include + ], [socklen_t len = 42; return 0;], + ac_cv_type_socklen_t=yes, ac_cv_type_socklen_t=no, + dnl When cross-compiling, do not assume anything. + ac_cv_type_socklen_t="guessing no" + ) +]) +if [[ "x$ac_cv_type_socklen_t" != "xyes" ]]; then + AC_DEFINE(socklen_t, int, [Define to 'int' if doesn't define.]) +fi + dnl Check whether struct sigaction has sa_restorer member. AC_CACHE_CHECK([whether struct sigaction has sa_restorer], ac_cv_signal_sa_restorer, [ @@ -344,13 +433,14 @@ if [[ "x$ac_cv_signal_sa_restorer" = "xy fi dnl Checks for library functions. -AC_CHECK_FUNCS(strdup strlcpy cfmakeraw) +AC_CHECK_FUNCS(strdup strerror strlcpy cfmakeraw) AC_CHECK_FUNCS(nanosleep) AC_CHECK_FUNCS(sigaction signal) AC_CHECK_FUNCS(mmap mprotect munmap) AC_CHECK_FUNCS(vm_allocate vm_deallocate vm_protect) AC_CHECK_FUNCS(exp2f log2f exp2 log2) AC_CHECK_FUNCS(floorf roundf ceilf truncf floor round ceil trunc) +AC_CHECK_FUNCS(poll inet_aton) dnl Darwin seems to define mach_task_self() instead of task_self(). AC_CHECK_FUNCS(mach_task_self task_self) @@ -390,6 +480,9 @@ mips-sony-bsd|mips-sony-newsos4) *-*-cygwin*) no_dev_ptmx=1 ;; +*-*-darwin*) + no_dev_ptmx=1 + ;; esac if test -z "$no_dev_ptmx" ; then @@ -410,15 +503,69 @@ AC_CHECK_FILE([/dev/ptc], ) dnl (end of code from openssh-3.2.2p1 configure.ac) +dnl Check for systems where POSIX-style non-blocking I/O (O_NONBLOCK) +dnl doesn't work or is unimplemented. On these systems (mostly older +dnl ones), use the old BSD-style FIONBIO approach instead. [tcl.m4] +AC_CACHE_CHECK([FIONBIO vs. O_NONBLOCK for non-blocking I/O], + ac_cv_nonblocking_io, [ + case "$host" in + *-*-osf*) + ac_cv_nonblocking_io=FIONBIO + ;; + *-*-sunos4*) + ac_cv_nonblocking_io=FIONBIO + ;; + *-*-ultrix*) + ac_cv_nonblocking_io=FIONBIO + ;; + *) + ac_cv_nonblocking_io=O_NONBLOCK + ;; + esac +]) +if [[ "$ac_cv_nonblocking_io" = "FIONBIO" ]]; then + AC_DEFINE(USE_FIONBIO, 1, [Define if BSD-style non-blocking I/O is to be used]) +fi + +dnl Check whether compiler supports byte bit-fields +AC_CACHE_CHECK([whether compiler supports byte bit-fields], + ac_cv_have_byte_bitfields, [ + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_RUN([ + struct A { + unsigned char b1:4; + unsigned char b2:4; + unsigned char c; + unsigned short s; + unsigned char a[4]; + }; + + int main(void) { + A a; + return ! (sizeof(A) == 8 && &a.c == ((unsigned char *)&a + 1)); + }], + [ac_cv_have_byte_bitfields=yes], + [ac_cv_have_byte_bitfields=no], + dnl When cross-compiling, assume only GCC supports this + [if [[ "$GCC" = "yes" ]]; then + ac_cv_have_byte_bitfields="guessing yes" + else + ac_cv_have_byte_bitfields="guessing no" + fi] + ) + AC_LANG_RESTORE +]) + dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES) -AC_DEFUN(AC_CHECK_FRAMEWORK, [ +AC_DEFUN([AC_CHECK_FRAMEWORK], [ AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])dnl AC_CACHE_CHECK([whether compiler supports framework $1], ac_Framework, [ saved_LIBS="$LIBS" LIBS="$LIBS -framework $1" AC_TRY_LINK( - [$2], [int main(void) { return 0; }], + [$2], [], [AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no); LIBS="$saved_LIBS"] ) ]) @@ -431,47 +578,129 @@ AC_DEFUN(AC_CHECK_FRAMEWORK, [ dnl Check for some MacOS X frameworks AC_CHECK_FRAMEWORK(Carbon, [#include ]) AC_CHECK_FRAMEWORK(IOKit, [#include ]) +AC_CHECK_FRAMEWORK(CoreFoundation, [#include ]) +AC_CHECK_FRAMEWORK(CoreAudio, [#include ]) +AC_CHECK_FRAMEWORK(AudioUnit, [#include ]) +AC_CHECK_FRAMEWORK(AudioToolbox, [#include ]) +AC_CHECK_FRAMEWORK(AppKit, []) dnl Select system-dependant sources. SERIALSRC=serial_unix.cpp ETHERSRC=../dummy/ether_dummy.cpp SCSISRC=../dummy/scsi_dummy.cpp AUDIOSRC=../dummy/audio_dummy.cpp +PREFSSRC=../dummy/prefs_dummy.cpp EXTFSSRC=extfs_unix.cpp EXTRASYSSRCS= case "$target_os" in linux*) - ETHERSRC=Linux/ether_linux.cpp + ETHERSRC=ether_unix.cpp AUDIOSRC=audio_oss_esd.cpp SCSISRC=Linux/scsi_linux.cpp if [[ "x$EMULATED_PPC" = "xno" ]]; then - EXTRASYSSRCS="Linux/paranoia.cpp Linux/sheepthreads.c ppc_asm.S" + EXTRASYSSRCS="paranoia.cpp Linux/sheepthreads.c ppc_asm.S" fi ;; +freebsd*) + ETHERSRC=ether_unix.cpp + ;; netbsd*) + ETHERSRC=ether_unix.cpp if [[ "x$EMULATED_PPC" = "xno" ]]; then - EXTRASYSSRCS="NetBSD/paranoia.cpp NetBSD/sheepthreads.c ppc_asm.S" + EXTRASYSSRCS="paranoia.cpp NetBSD/sheepthreads.c ppc_asm.S" fi ;; darwin*) + ETHERSRC=ether_unix.cpp if [[ "x$EMULATED_PPC" = "xno" ]]; then - EXTRASYSSRCS="Darwin/paranoia.cpp ppc_asm.S" + EXTRASYSSRCS="paranoia.cpp ppc_asm.S" fi - if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then + if [[ "x$ac_cv_framework_IOKit" = "xyes" -a "x$ac_cv_framework_CoreFoundation" = "xyes" ]]; then EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp" fi if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then - EXTFSSRC=../MacOSX/extfs_macosx.mm + EXTFSSRC=../MacOSX/extfs_macosx.cpp + if [[ "x$ac_cv_framework_AppKit" = "xyes" -a "x$WANT_GTK" = "xno" ]]; then + PREFSSRC="../MacOSX/prefs_macosx.mm ../MacOSX/Launcher/VMSettingsController.mm" + CPPFLAGS="$CPPFLAGS -I../MacOSX/Launcher" + fi + fi + if [[ "x$WANT_ESD" = "xno" -a "x$ac_cv_framework_CoreAudio" = "xyes" -a "x$WANT_SDL_AUDIO" = "xno" ]]; then + AUDIOSRC="../MacOSX/audio_macosx.cpp ../MacOSX/AudioBackEnd.cpp ../MacOSX/AudioDevice.cpp ../MacOSX/MacOSX_sound_if.cpp" + OSX_CORE_AUDIO="-DOSX_CORE_AUDIO" fi ;; -cygwin*) - SERIALSRC="../dummy/serial_dummy.cpp" +irix*) + AUDIOSRC=Irix/audio_irix.cpp + LIBS="$LIBS -laudio" + WANT_ESD=no + + dnl Check if our compiler supports -IPA (MIPSPro) + HAVE_IPA=no + ocflags="$CFLAGS" + CFLAGS=`echo " $CFLAGS -IPA" | sed -e "s/ -g //g"` + AC_MSG_CHECKING(if "-IPA" works) + dnl Do a test compile of an empty function + AC_TRY_COMPILE([#if defined __GNUC__ + # error GCC does not support IPA yet + #endif],, [AC_MSG_RESULT(yes); HAVE_IPA=yes], AC_MSG_RESULT(no)) + CFLAGS="$ocflags" ;; esac +dnl BINCUE +AS_IF([test "x$with_bincue" = "xyes" ], [have_bincue=yes], [have_bincue=no]) +AS_IF([test "x$have_bincue" = "xyes" ], [ + if [[ "xOSX_CORE_AUDIO" = "xno" -a "x$WANT_SDL_AUDIO"="xno"]]; then + AC_MSG_ERROR([You need SDL or OSX Core Audio to use BINCUE support.]) + else + CPPFLAGS="$CPPFLAGS -DBINCUE $OSX_CORE_AUDIO" + fi +]) + +dnl LIBVHD +AS_IF([test "x$with_libvhd" = "xyes" ], [have_libvhd=yes], [have_libvhd=no]) +AS_IF([test "x$have_libvhd" = "xyes" ], [ + CPPFLAGS="$CPPFLAGS -DHAVE_LIBVHD" + LIBS="$LIBS -lvhd" + case $target_os in + linux*) + LIBS="$LIBS -luuid" + esac + AC_CHECK_LIB(vhd, vhd_open) + AC_CHECK_LIB(vhd, vhd_io_read) + AC_CHECK_LIB(vhd, vhd_io_write) + AC_CHECK_LIB(vhd, vhd_close) +]) + + + + +dnl Is the slirp library supported? +case "$ac_cv_have_byte_bitfields" in +yes|"guessing yes") + CAN_SLIRP=yes + ETHERSRC=ether_unix.cpp + ;; +esac +if [[ -n "$CAN_SLIRP" ]]; then + AC_DEFINE(HAVE_SLIRP, 1, [Define if slirp library is supported]) + SLIRP_SRCS="\ + ../slirp/bootp.c ../slirp/ip_output.c ../slirp/tcp_input.c \ + ../slirp/cksum.c ../slirp/mbuf.c ../slirp/tcp_output.c \ + ../slirp/debug.c ../slirp/misc.c ../slirp/tcp_subr.c \ + ../slirp/if.c ../slirp/sbuf.c ../slirp/tcp_timer.c \ + ../slirp/ip_icmp.c ../slirp/slirp.c ../slirp/tftp.c \ + ../slirp/ip_input.c ../slirp/socket.c ../slirp/udp.c" +fi +AC_SUBST(SLIRP_SRCS) + dnl SDL overrides if [[ "x$WANT_SDL" = "xyes" ]]; then AC_DEFINE(USE_SDL, 1, [Define to enble SDL support.]) + if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then + EXTRASYSSRCS="$EXTRASYSSRCS ../SDL/SDLMain.m" + fi fi if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support.]) @@ -479,15 +708,10 @@ if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; th KEYCODES="../SDL/keycodes" if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/clip_macosx.cpp" + EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/utils_macosx.mm" + CPPFLAGS="$CPPFLAGS -I../MacOSX" else - case "$target_os" in - cygwin*) - EXTRASYSSRCS="$EXTRASYSSRCS ../Windows/clip_windows.cpp" - ;; - *) - EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp" - ;; - esac + EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp" fi else VIDEOSRCS="video_x.cpp" @@ -499,14 +723,27 @@ if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th AUDIOSRC="../SDL/audio_sdl.cpp" fi -SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS" +dnl BINCUE overrides + +if [[ "x$have_bincue" = "xyes" ]]; then + EXTRASYSSRCS="$EXTRASYSSRCS bincue_unix.cpp" +fi + +dnl libvhd overrides + +if [[ "x$have_libvhd" = "xyes" ]]; then + EXTRASYSSRCS="$EXTRASYSSRCS vhd_unix.cpp" +fi + + +SYSSRCS="$VIDEOSRCS $EXTFSSRC $PREFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS" dnl Define a macro that translates a yesno-variable into a C macro definition dnl to be put into the config.h file dnl $1 -- the macro to define dnl $2 -- the value to translate dnl $3 -- template name -AC_DEFUN(AC_TRANSLATE_DEFINE, [ +AC_DEFUN([AC_TRANSLATE_DEFINE], [ if [[ "x$2" = "xyes" -o "x$2" = "xguessing yes" ]]; then AC_DEFINE($1, 1, $3) fi @@ -516,6 +753,9 @@ dnl Check that the host supports TUN/TAP AC_CACHE_CHECK([whether TUN/TAP is supported], ac_cv_tun_tap_support, [ AC_TRY_COMPILE([ + #if defined(HAVE_NETINET_IN_H) + #include + #endif #if defined(HAVE_LINUX_IF_H) && defined(HAVE_LINUX_IF_TUN_H) #include #include @@ -915,12 +1155,6 @@ fi dnl Check addressing mode to use AC_MSG_CHECKING([for addressing mode to use]) -case "$os_target" in -cygwin*) - WANT_ADDRESSING_MODE="direct,cygwin-hack" - NATMEM_OFFSET= - ;; -esac if [[ "$EMULATED_PPC" != "yes" ]]; then if [[ "$WANT_ADDRESSING_MODE" != "real" ]]; then AC_MSG_WARN([Running in native PowerPC mode, force use of Real Addressing.]) @@ -1152,20 +1386,24 @@ fi dnl Check for GCC 2.7 or higher. HAVE_GCC27=no AC_MSG_CHECKING(for GCC 2.7 or higher) -AC_EGREP_CPP(xyes, -[#if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5 - xyes -#endif -], [AC_MSG_RESULT(yes); HAVE_GCC27=yes], AC_MSG_RESULT(no)) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5) + # error gcc < 2.7 + typedef syntax error; + #endif + ]])], + [AC_MSG_RESULT(yes); HAVE_GCC27=yes], + [AC_MSG_RESULT(no)]) dnl Check for GCC 3.0 or higher. HAVE_GCC30=no AC_MSG_CHECKING(for GCC 3.0 or higher) -AC_EGREP_CPP(xyes, -[#if __GNUC__ >= 3 - xyes -#endif -], [AC_MSG_RESULT(yes); HAVE_GCC30=yes], AC_MSG_RESULT(no)) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ >= 3) + # error gcc < 3 + typedef syntax error; + #endif + ]])], + [AC_MSG_RESULT(yes); HAVE_GCC30=yes], + [AC_MSG_RESULT(no)]) dnl Check for ICC. AC_MSG_CHECKING(for ICC) @@ -1196,9 +1434,22 @@ AC_CACHE_CHECK([the format of compiler g rm -rf conftest* ]) -dnl Add -mdynamic-no-pic for MacOS X +dnl Add -fno-strict-aliasing for slirp sources if [[ "x$HAVE_GCC30" = "xyes" ]]; then SAVED_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -fno-strict-aliasing" + AC_CACHE_CHECK([whether the compiler supports -fno-strict-aliasing], + ac_cv_gcc_no_strict_aliasing, [ + AC_TRY_COMPILE([],[], + [ac_cv_gcc_no_strict_aliasing=yes; AC_SUBST(SLIRP_CFLAGS, "-fno-strict-aliasing")], + [ac_cv_gcc_no_strict_aliasing=no]) + ]) + CFLAGS="$SAVED_CFLAGS" +fi + +dnl Add -mdynamic-no-pic for MacOS X (XXX icc10 will support MacOS X) +if [[ "x$HAVE_GCC30" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then + SAVED_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mdynamic-no-pic" AC_CACHE_CHECK([whether the compiler supports -mdynamic-no-pic], ac_cv_gcc_mdynamic_no_pic, [ @@ -1219,7 +1470,8 @@ if [[ "x$EMULATED_PPC" = "xyes" ]]; then ../kpx_cpu/src/cpu/ppc/ppc-cpu.cpp \ ../kpx_cpu/src/cpu/ppc/ppc-decode.cpp \ ../kpx_cpu/src/cpu/ppc/ppc-execute.cpp \ - ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp" + ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp \ + ../kpx_cpu/src/utils/utils-cpuinfo.cpp" CPPFLAGS="$CPPFLAGS -I../kpx_cpu/include -I../kpx_cpu/src" dnl Enable JIT compiler, if possible @@ -1236,9 +1488,18 @@ if [[ "x$EMULATED_PPC" = "xyes" ]]; then i?86:elf) ac_cv_use_dyngen=yes ;; + mips:elf) + ac_cv_use_dyngen=yes + ;; powerpc:mach) ac_cv_use_dyngen=yes ;; + x86_64:mach) + ac_cv_use_dyngen=yes + ;; + i?86:mach) + ac_cv_use_dyngen=yes + ;; *:*) ac_cv_use_dyngen=no ;; @@ -1248,7 +1509,7 @@ if [[ "x$EMULATED_PPC" = "xyes" ]]; then if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then DYNGEN_CC=$CXX else - for p in /usr/bin /usr/local/bin; do + for p in /usr/bin /usr/local/bin /usr/freeware/bin; do gxx="$p/g++" if [[ -x "$gxx" ]]; then DYNGEN_CC="$gxx" @@ -1263,7 +1524,10 @@ if [[ "x$EMULATED_PPC" = "xyes" ]]; then if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then case $host_cpu in i?86) - DYNGEN_OP_FLAGS="-fomit-frame-pointer -mpreferred-stack-boundary=2" + DYNGEN_OP_FLAGS="-fomit-frame-pointer" + ;; + mips) + DYNGEN_OP_FLAGS="-fno-delayed-branch -mno-abicalls" ;; powerpc) if [[ "x$ac_cv_object_format" = "xmach" ]]; then @@ -1271,15 +1535,27 @@ if [[ "x$EMULATED_PPC" = "xyes" ]]; then fi ;; esac - if [[ "x$HAVE_GCC30" = "xyes" ]]; then - DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -falign-functions=0" + have_dyngen_gcc3=no + case "x`$DYNGEN_CC -dumpversion`" in + x[12].*) ;; + x*) have_dyngen_gcc3=yes ;; + esac + if [[ "x$have_dyngen_gcc3" = "xyes" ]]; then + DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-align-functions" else DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0" fi - DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-limit=10000 -fno-exceptions -g0" - if [[ "x$HAVE_GCC30" = "xyes" ]]; then + DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-functions -finline-limit=10000 -fno-exceptions -g0" + if [[ "x$have_dyngen_gcc3" = "xyes" ]]; then DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-reorder-blocks -fno-optimize-sibling-calls" fi + if [[ "x$DYNGEN_CC" != "x$CXX" ]]; then + DYNGEN_CFLAGS="-O2 $CFLAGS" + DYNGEN_CXXFLAGS="-O2 $CXXFLAGS" + else + DYNGEN_CFLAGS="\$(CFLAGS)" + DYNGEN_CXXFLAGS="\$(CXXFLAGS)" + fi else WANT_JIT=no fi @@ -1291,48 +1567,66 @@ if [[ "x$EMULATED_PPC" = "xyes" ]]; then CPUSRCS="\ ../kpx_cpu/src/cpu/jit/jit-cache.cpp \ ../kpx_cpu/src/cpu/jit/basic-dyngen.cpp \ - ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp $CPUSRCS" + ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp \ + ../kpx_cpu/src/cpu/ppc/ppc-jit.cpp $CPUSRCS" fi fi CPUSRCS="$CPUSRCS ../kpx_cpu/sheepshaver_glue.cpp" else WANT_JIT=no fi -if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then - AC_CACHE_CHECK([whether static data regions are executable], - ac_cv_have_static_data_exec, [ - AC_TRY_RUN([int main(void) { -#if defined(__powerpc__) || defined(__ppc__) - static unsigned int p[8] = {0x4e800020,}; - asm volatile("dcbst 0,%0" : : "r" (p) : "memory"); - asm volatile("sync" : : : "memory"); - asm volatile("icbi 0,%0" : : "r" (p) : "memory"); - asm volatile("sync" : : : "memory"); - asm volatile("isync" : : : "memory"); - ((void (*)(void))p)(); - return 0; -#endif - return 1; - }], ac_cv_have_static_data_exec=yes, ac_cv_have_static_data_exec=no, - dnl When cross-compiling, do not assume anything. - ac_cv_have_static_data_exec=no - ) - ]) -else - ac_cv_use_dyngen=no -fi -AC_TRANSLATE_DEFINE(HAVE_STATIC_DATA_EXEC, "$ac_cv_have_static_data_exec", - [Define if your system marks static data pages as executable.]) - if [[ "x$WANT_JIT" = "xyes" ]]; then CPPFLAGS="$CPPFLAGS -DUSE_JIT" fi +dnl Higher level optimizations with MIPSPro compilers are possible +if [[ "x$HAVE_IPA" = "xyes" ]]; then + CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'` -O3 -OPT:Olimit=0 -IPA" + CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-g//g'` -O3 -OPT:Olimit=0 -IPA" + CXXFLAGS="-LANG:std $CXXFLAGS" + LDFLAGS="$LDFLAGS -O3 -OPT:Olimit=0 -IPA" +fi + +dnl Check for linker script support +case $target_os:$target_cpu in +linux*:i?86) LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";; +linux*:x86_64) LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-x86_64.ld";; +linux*:powerpc) LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-ppc.ld";; +netbsd*:i?86) LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";; +freebsd*:i?86) LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/freebsd-i386.ld";; +darwin*:*) LINKER_SCRIPT_FLAGS="-Wl,-seg1addr,0x78048000";; +esac +if [[ -n "$LINKER_SCRIPT_FLAGS" ]]; then + AC_CACHE_CHECK([whether linker script is usable], + ac_cv_linker_script_works, [ + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $LINKER_SCRIPT_FLAGS" + AC_TRY_RUN( + [int main() {if ((char *)&main < (char *)0x70000000) return 1;}], + [ac_cv_linker_script_works=yes], + [ac_cv_linker_script_works=no], + dnl When cross-compiling, assume it works + [ac_cv_linker_script_works="guessing yes"] + ) + AC_LANG_RESTORE + if [[ "$ac_cv_linker_script_works" = "no" ]]; then + LDFLAGS="$saved_LDFLAGS" + LINKER_SCRIPT_FLAGS="" + fi + ]) +fi +AC_TRANSLATE_DEFINE(HAVE_LINKER_SCRIPT, "$ac_cv_linker_script_works", + [Define if there is a linker script to relocate the executable above 0x70000000.]) + dnl Generate Makefile. AC_SUBST(PERL) AC_SUBST(USE_DYNGEN, [$ac_cv_use_dyngen]) AC_SUBST(DYNGENSRCS) AC_SUBST(DYNGEN_CC) +AC_SUBST(DYNGEN_CFLAGS) +AC_SUBST(DYNGEN_CXXFLAGS) AC_SUBST(DYNGEN_OP_FLAGS) AC_SUBST(SYSSRCS) AC_SUBST(CPUSRCS) @@ -1348,6 +1642,8 @@ echo echo SheepShaver configuration summary: echo echo SDL support ...................... : $SDL_SUPPORT +echo BINCUE support ................... : $have_bincue +echo LIBVHD support ................... : $have_libvhd echo FBDev DGA support ................ : $WANT_FBDEV_DGA echo XFree86 DGA support .............. : $WANT_XF86_DGA echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE