Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-08-07 20:25:23 +00:00
Code Issues Projects Releases Wiki Activity

[Geoffrey Brown]

Browse Source 
VHD support
This commit is contained in:
asvitkine
2010-10-19 22:20:01 +00:00
parent 1170b925ee
commit 63cf1fadc3
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
SheepShaver/Makefile
View File

@@ -60,6 +60,7 @@ links:
BeOS/serial_beos.cpp BeOS/sys_beos.cpp BeOS/timer_beos.cpp \ BeOS/serial_beos.cpp BeOS/sys_beos.cpp BeOS/timer_beos.cpp \
BeOS/xpram_beos.cpp BeOS/SheepDriver BeOS/SheepNet \ BeOS/xpram_beos.cpp BeOS/SheepDriver BeOS/SheepNet \
Unix/audio_oss_esd.cpp Unix/bincue_unix.cpp Unix/bincue_unix.h \ Unix/audio_oss_esd.cpp Unix/bincue_unix.cpp Unix/bincue_unix.h \
Unix/vhd_unix.cpp Unix/vhd_unix.h \
Unix/extfs_unix.cpp Unix/serial_unix.cpp \ Unix/extfs_unix.cpp Unix/serial_unix.cpp \
Unix/sshpty.h Unix/sshpty.c Unix/strlcpy.h Unix/strlcpy.c \ Unix/sshpty.h Unix/sshpty.c Unix/strlcpy.h Unix/strlcpy.c \
Unix/sys_unix.cpp Unix/timer_unix.cpp Unix/xpram_unix.cpp \ Unix/sys_unix.cpp Unix/timer_unix.cpp Unix/xpram_unix.cpp \

27
SheepShaver/src/Unix/configure.ac
View File

@@ -44,6 +44,9 @@ AC_ARG_WITH(dgcc, [ --with-dgcc=COMPILER use C++ COMPILER to compi
AC_ARG_WITH(bincue, AC_ARG_WITH(bincue,
AS_HELP_STRING([--with-bincue], [Allow cdrom image files in bin/cue mode])) 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 dnl Addressing mode
AC_ARG_ENABLE(addressing, AC_ARG_ENABLE(addressing,
@@ -648,6 +651,23 @@ AS_IF([test "x$have_bincue" = "xyes" ], [
fi 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? dnl Is the slirp library supported?
case "$ac_cv_have_byte_bitfields" in case "$ac_cv_have_byte_bitfields" in
@@ -700,6 +720,12 @@ if [[ "x$have_bincue" = "xyes" ]]; then
EXTRASYSSRCS="$EXTRASYSSRCS bincue_unix.cpp" EXTRASYSSRCS="$EXTRASYSSRCS bincue_unix.cpp"
fi 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" SYSSRCS="$VIDEOSRCS $EXTFSSRC $PREFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
@@ -1602,6 +1628,7 @@ echo SheepShaver configuration summary:
echo echo
echo SDL support ...................... : $SDL_SUPPORT echo SDL support ...................... : $SDL_SUPPORT
echo BINCUE support ................... : $have_bincue echo BINCUE support ................... : $have_bincue
echo LIBVHD support ................... : $have_libvhd
echo FBDev DGA support ................ : $WANT_FBDEV_DGA echo FBDev DGA support ................ : $WANT_FBDEV_DGA
echo XFree86 DGA support .............. : $WANT_XF86_DGA echo XFree86 DGA support .............. : $WANT_XF86_DGA
echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE