Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-01-11 10:30:09 +00:00
Code Issues Projects Releases Wiki Activity

- updated for latest version of mon

Browse Source
This commit is contained in:
cebix 2000-10-15 15:08:24 +00:00
parent 1b751e0339
commit 10f4035c6e
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BasiliskII/src/AmigaOS/extfs_amiga.cpp
View File

@ -156,6 +156,7 @@ static const ext2type e2t_translation[] = {
{".z", FOURCC('Z','I','V','M'), FOURCC('L','Z','I','V')}, {".z", FOURCC('Z','I','V','M'), FOURCC('L','Z','I','V')},
{".gz", FOURCC('G','z','i','p'), FOURCC('G','z','i','p')}, {".gz", FOURCC('G','z','i','p'), FOURCC('G','z','i','p')},
{".hqx", FOURCC('T','E','X','T'), FOURCC('S','I','T','x')}, {".hqx", FOURCC('T','E','X','T'), FOURCC('S','I','T','x')},
{".bin", FOURCC('T','E','X','T'), FOURCC('S','I','T','x')},
{".pdf", FOURCC('P','D','F',' '), FOURCC('C','A','R','O')}, {".pdf", FOURCC('P','D','F',' '), FOURCC('C','A','R','O')},
{".ps", FOURCC('T','E','X','T'), FOURCC('t','t','x','t')}, {".ps", FOURCC('T','E','X','T'), FOURCC('t','t','x','t')},
{".sit", FOURCC('S','I','T','!'), FOURCC('S','I','T','x')}, {".sit", FOURCC('S','I','T','!'), FOURCC('S','I','T','x')},

6
BasiliskII/src/Unix/aclocal.m4 vendored
View File

@ -245,8 +245,6 @@ AC_ARG_ENABLE(esdtest, [ --disable-esdtest Do not try to compile and run
if test "$ESD_CONFIG" = "no" ; then if test "$ESD_CONFIG" = "no" ; then
no_esd=yes no_esd=yes
else else
AC_LANG_SAVE
AC_LANG_C
ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags` ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs` ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
@ -323,7 +321,6 @@ int main ()
],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
AC_LANG_RESTORE
fi fi
fi fi
if test "x$no_esd" = x ; then if test "x$no_esd" = x ; then
@ -343,8 +340,6 @@ int main ()
echo "*** Could not run ESD test program, checking why..." echo "*** Could not run ESD test program, checking why..."
CFLAGS="$CFLAGS $ESD_CFLAGS" CFLAGS="$CFLAGS $ESD_CFLAGS"
LIBS="$LIBS $ESD_LIBS" LIBS="$LIBS $ESD_LIBS"
AC_LANG_SAVE
AC_LANG_C
AC_TRY_LINK([ AC_TRY_LINK([
#include <stdio.h> #include <stdio.h>
#include <esd.h> #include <esd.h>
@ -364,7 +359,6 @@ int main ()
echo "*** may want to edit the esd-config script: $ESD_CONFIG" ]) echo "*** may want to edit the esd-config script: $ESD_CONFIG" ])
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
AC_LANG_RESTORE
fi fi
fi fi
ESD_CFLAGS="" ESD_CFLAGS=""

2
BasiliskII/src/Unix/configure.in
View File

@ -71,7 +71,7 @@ if [[ "x$WANT_MON" = "xyes" ]]; then
if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(ENABLE_MON) AC_DEFINE(ENABLE_MON)
MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_8080.cpp $mon_srcdir/mon_cmd.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_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"
CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass" CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
AC_CHECK_LIB(readline, readline) AC_CHECK_LIB(readline, readline)
AC_CHECK_LIB(termcap, tputs) AC_CHECK_LIB(termcap, tputs)