commit de436b141cfdc515bcccee905fa7df9daff25801
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Thu Jul 7 15:19:13 2016 +0200
Sync version with BasiliskII package / latest upstream
- New version comes with bundled cxmon
- Fix FTBFS
- Use proper github download URL
- Add appdata
.gitignore | 2 +-
SheepShaver.appdata.xml | 26 +++++++++++
SheepShaver.desktop | 9 ++++
SheepShaver.png | Bin 0 -> 9250 bytes
SheepShaver.spec | 95 ++++++++++++++++++++++-------------------
cxmon-3.2-fpermissive.patch | 72 +++++++++++++++++++++++++++++++
cxmon-3.2-hide-symbols.patch | 12 +++---
cxmon-3.2-strfmt.patch | 6 +--
macemu-not-finding-cxmon.patch | 38 +++++++++++++++++
sources | 4 +-
10 files changed, 207 insertions(+), 57 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 549f4b6..beb602c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
cxmon-3.2-cvs20130310.tar.gz
-SheepShaver.png
macemu-master.zip
+BasiliskII-1.0-b58a926.tar.gz
diff --git a/SheepShaver.appdata.xml b/SheepShaver.appdata.xml
new file mode 100644
index 0000000..2c43519
--- /dev/null
+++ b/SheepShaver.appdata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component type="desktop">
+ <id>SheepShaver.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-2.0+</project_license>
+ <name>SheepShaver</name>
+ <summary>MacOS run-time environment</summary>
+ <description>
+ <p>
+ SheepShaver is a MacOS run-time environment that allows you to run classic
+ MacOS applications inside the Linux multitasking environment. This means
+ that both Linux and MacOS applications can run at the same time (usually
+ in a window on the Linux desktop) and data can be exchanged between them.
+ </p>
+ <p>
+ If you are using a PowerPC-based system, applications will run at native
+ speed (i.e. with no emulation involved). There is also a built-in PowerPC
+ emulator for non-PowerPC systems.
+ </p>
+ </description>
+ <url
type="homepage">http://sheepshaver.cebix.net/</url>
+ <screenshots>
+ <screenshot
type="default">http://simon.mooli.org.uk/LXF/AppleMacs/pix/SheepShaver_linux1.png</screenshot>
+ </screenshots>
+ <updatecontact>jwrdegoede_at_gmail.com</updatecontact>
+</component>
diff --git a/SheepShaver.desktop b/SheepShaver.desktop
new file mode 100644
index 0000000..8cd5406
--- /dev/null
+++ b/SheepShaver.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Sheep Shaver
+Comment=Power Macintosh Emulator
+Exec=SheepShaver
+Icon=SheepShaver
+Terminal=false
+Type=Application
+Categories=Game;Emulator;
+Keywords=Macintosh;PPC;PowerPc;Emulator;
diff --git a/SheepShaver.png b/SheepShaver.png
new file mode 100644
index 0000000..2d4cbc7
Binary files /dev/null and b/SheepShaver.png differ
diff --git a/SheepShaver.spec b/SheepShaver.spec
index d25f29b..4f27a6c 100644
--- a/SheepShaver.spec
+++ b/SheepShaver.spec
@@ -1,21 +1,27 @@
-%define date 20150516
-%define mon_version 3.2
+%global commit b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%define date 20160322
+
+# Hardening breaks the jit
+%undefine _hardened_build
Summary: Power Macintosh emulator
Name: SheepShaver
Version: 2.4
-Release: 0.1.%{date}%{?dist}
+Release: 0.2.%{date}%{?dist}
License: GPLv2+
URL:
http://sheepshaver.cebix.net/
-# GRRR github, no url ...
-Source0: macemu-master.zip
-Source1: cxmon-3.2-cvs20130310.tar.gz
-Source2: SheepShaver.png
-# Patch 10+ because this is for Source1 rather then Source0
+Source0:
https://github.com/cebix/macemu/archive/%{commit}/BasiliskII-1.0-%{shortc...
+Source1: %{name}.desktop
+Source2: %{name}.png
+Source3: %{name}.appdata.xml
+Patch0: macemu-not-finding-cxmon.patch
+# Patch 10+ because these are for cxmon
Patch10: cxmon-3.2-hide-symbols.patch
Patch11: cxmon-3.2-strfmt.patch
+Patch12: cxmon-3.2-fpermissive.patch
BuildRequires: libtool gcc-c++ gtk2-devel
-BuildRequires: desktop-file-utils readline-devel
+BuildRequires: desktop-file-utils libappstream-glib readline-devel
BuildRequires: libXt-devel libXxf86vm-devel SDL-devel
Requires: hicolor-icon-theme
# Other archs need an instruction skipper on well-known invalid
@@ -33,20 +39,23 @@ G4 emulator, without MMU support, for non-PowerPC systems.
%prep
-%setup -q -a 1 -n macemu-master
-pushd cxmon-%{mon_version}
+%setup -q -n macemu-%{commit}
+%patch0 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
+sed -i 's/\r//' %{name}/src/Unix/tinyxml2.cpp
+chmod -x %{name}/src/Unix/tinyxml2.cpp %{name}/src/Unix/tinyxml2.h
+chmod -x %{name}/src/kpx_cpu/src/mathlib/ieeefp.hpp
+# autogen
+pushd %{name}/src/Unix
+NO_CONFIGURE=1 ./autogen.sh
popd
-chmod -x SheepShaver/src/kpx_cpu/src/mathlib/ieeefp.hpp
%build
-pushd SheepShaver/src/Unix
-NO_CONFIGURE=1 ./autogen.sh
-export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive"
+pushd %{name}/src/Unix
%configure --datadir=%{_sysconfdir} --enable-ppc-emulator=yes \
- --with-mon=../../../cxmon-%{mon_version}/src \
--disable-xf86-dga --enable-sdl-audio --with-bincue
DYNGEN_CFLAGS="$(echo $RPM_OPT_FLAGS | sed s/-fstack-protector-strong//)"
make %{?_smp_mflags} \
@@ -55,32 +64,21 @@ popd
%install
-pushd SheepShaver/src/Unix
-make install DESTDIR=$RPM_BUILD_ROOT
+pushd %{name}/src/Unix
+%make_install
popd
chmod +x $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/tunconfig
-# Create the system menu entry
-%{__cat} > %{name}.desktop << EOF
-[Desktop Entry]
-Name=Sheep Shaver
-Comment=Power Macintosh Emulator
-Exec=SheepShaver
-Icon=SheepShaver
-Terminal=false
-Type=Application
-Categories=Game;Emulator;
-EOF
-
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-%if 0%{?fedora} && 0%{?fedora} < 19
- --vendor rpmforge \
-%endif
- %{name}.desktop
+desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
install -D -p -m 0644 %{SOURCE2} \
- %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/SheepShaver.png
+ %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+
+install -D -p -m 0644 %{SOURCE3} \
+ %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
+appstream-util validate-relax --nonet \
+ %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
%post
@@ -97,17 +95,26 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||
:
%files
-%doc SheepShaver/COPYING SheepShaver/NEWS SheepShaver/doc/Linux/*
-%dir %{_sysconfdir}/SheepShaver/
-%config(noreplace) %{_sysconfdir}/SheepShaver/keycodes
-%{_sysconfdir}/SheepShaver/tunconfig
-%{_bindir}/SheepShaver
-%{_datadir}/icons/hicolor/32x32/apps/SheepShaver.png
-%{_datadir}/applications/*%{name}.desktop
-%{_mandir}/man1/SheepShaver.1*
+%doc %{name}/NEWS %{name}/doc/Linux/*
+%license %{name}/COPYING
+%dir %{_sysconfdir}/%{name}/
+%config(noreplace) %{_sysconfdir}/%{name}/keycodes
+%{_sysconfdir}/%{name}/tunconfig
+%{_bindir}/%{name}
+%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+%{_mandir}/man1/%{name}.1*
%changelog
+* Thu Jul 7 2016 Hans de Goede <j.w.r.degoede(a)gmail.com> - 2.4-0.2.20160322
+- Sync version with BasiliskII package / latest upstream
+- New version comes with bundled cxmon
+- Fix FTBFS
+- Use proper github download URL
+- Add appdata
+
* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 2.4-0.1.20150516
- SheepShaver 2.4 git snapshot du-jour
- Fix FTBFS (rf#3634)
diff --git a/cxmon-3.2-fpermissive.patch b/cxmon-3.2-fpermissive.patch
new file mode 100644
index 0000000..987b146
--- /dev/null
+++ b/cxmon-3.2-fpermissive.patch
@@ -0,0 +1,72 @@
+diff -up macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/cxmon/src/mon.cpp~
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/cxmon/src/mon.cpp
+--- macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/cxmon/src/mon.cpp~ 2016-03-22
10:27:20.000000000 +0100
++++ macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/cxmon/src/mon.cpp 2016-03-22
10:30:18.671721029 +0100
+@@ -1112,7 +1112,7 @@ void mon_exit()
+ * Main function, read-execute loop
+ */
+
+-void mon(int argc, char **argv)
++void mon(int argc, const char **argv)
+ {
+ bool done = false, interactive = true;
+
+diff -up macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/cxmon/src/mon.h~
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/cxmon/src/mon.h
+--- macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/cxmon/src/mon.h~ 2016-01-31
16:00:57.000000000 +0100
++++ macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/cxmon/src/mon.h 2016-03-22
10:30:19.137721654 +0100
+@@ -30,7 +30,7 @@
+
+ void mon_init();
+ void mon_exit();
+-void mon(int argc, char **argv);
++void mon(int argc, const char **argv);
+
+
+ /*
+diff -up
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-execute.cpp~
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-execute.cpp
+---
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-execute.cpp~ 2016-01-31
16:00:57.000000000 +0100
++++
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-execute.cpp 2016-07-07
14:44:00.099249460 +0200
+@@ -67,7 +67,7 @@ void powerpc_cpu::execute_illegal(uint32
+ disass_ppc(stdout, pc(), opcode);
+
+ // Start up mon in real-mode
+- char *arg[4] = {"mon", "-m", "-r", NULL};
++ const char *arg[4] = {"mon", "-m", "-r", NULL};
+ mon(3, arg);
+ #endif
+ abort();
+diff -up
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/sheepshaver_glue.cpp~
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/sheepshaver_glue.cpp
+---
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/sheepshaver_glue.cpp~ 2016-01-31
16:00:57.000000000 +0100
++++
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/sheepshaver_glue.cpp 2016-07-07
14:45:33.741857603 +0200
+@@ -83,7 +83,7 @@ static void enter_mon(void)
+ {
+ // Start up mon in real-mode
+ #if ENABLE_MON
+- char *arg[4] = {"mon", "-m", "-r", NULL};
++ const char *arg[4] = {"mon", "-m", "-r", NULL};
+ mon(3, arg);
+ #endif
+ }
+diff -up
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-cpu.cpp~
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-cpu.cpp
+---
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-cpu.cpp~ 2016-01-31
16:00:57.000000000 +0100
++++
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-cpu.cpp 2016-07-07
14:48:51.031138859 +0200
+@@ -527,7 +527,7 @@ bool powerpc_cpu::check_spcflags()
+ spcflags().clear(SPCFLAG_CPU_ENTER_MON);
+ #if ENABLE_MON
+ // Start up mon in real-mode
+- char *arg[] = {
++ const char *arg[] = {
+ "mon",
+ #ifdef SHEEPSHAVER
+ "-m",
+diff -up
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-translate.cpp~
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-translate.cpp
+---
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-translate.cpp~ 2016-01-31
16:00:57.000000000 +0100
++++
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-translate.cpp 2016-07-07
14:48:12.805890613 +0200
+@@ -95,7 +95,7 @@ static void disasm_block(int target, uin
+ target == TARGET_POWERPC ? "d" : "x",
+ start, start + length - 1);
+
+- char *arg[] = {"mon",
++ const char *arg[] = {"mon",
+ #ifdef SHEEPSHAVER
+ "-m",
+ #endif
diff --git a/cxmon-3.2-hide-symbols.patch b/cxmon-3.2-hide-symbols.patch
index 95a427d..8d783b3 100644
--- a/cxmon-3.2-hide-symbols.patch
+++ b/cxmon-3.2-hide-symbols.patch
@@ -1,6 +1,6 @@
-diff -up cxmon-3.2/src/mon_disass.cpp~ cxmon-3.2/src/mon_disass.cpp
---- cxmon-3.2/src/mon_disass.cpp~ 2007-06-07 11:51:56.000000000 +0200
-+++ cxmon-3.2/src/mon_disass.cpp 2013-03-10 23:18:29.846310333 +0100
+diff -up cxmon-3.2/cxmon/src/mon_disass.cpp~ cxmon-3.2/cxmon/src/mon_disass.cpp
+--- cxmon-3.2/cxmon/src/mon_disass.cpp~ 2007-06-07 11:51:56.000000000 +0200
++++ cxmon-3.2/cxmon/src/mon_disass.cpp 2013-03-10 23:18:29.846310333 +0100
@@ -41,21 +41,21 @@ bool mon_macos_mode = false;
extern "C" {
#include "disass/dis-asm.h"
@@ -36,9 +36,9 @@ diff -up cxmon-3.2/src/mon_disass.cpp~ cxmon-3.2/src/mon_disass.cpp
{
return 0;
}
-diff -up cxmon-3.2/src/disass/dis-asm.h~ cxmon-3.2/src/disass/dis-asm.h
---- cxmon-3.2/src/disass/dis-asm.h~ 2002-09-07 14:48:15.000000000 +0200
-+++ cxmon-3.2/src/disass/dis-asm.h 2013-03-10 23:22:15.510311199 +0100
+diff -up cxmon-3.2/cxmon/src/disass/dis-asm.h~ cxmon-3.2/cxmon/src/disass/dis-asm.h
+--- cxmon-3.2/cxmon/src/disass/dis-asm.h~ 2002-09-07 14:48:15.000000000 +0200
++++ cxmon-3.2/cxmon/src/disass/dis-asm.h 2013-03-10 23:22:15.510311199 +0100
@@ -249,29 +249,6 @@ extern disassembler_ftype disassembler P
extern void disassembler_usage PARAMS ((FILE *));
diff --git a/cxmon-3.2-strfmt.patch b/cxmon-3.2-strfmt.patch
index f343e46..5fca50e 100644
--- a/cxmon-3.2-strfmt.patch
+++ b/cxmon-3.2-strfmt.patch
@@ -1,6 +1,6 @@
-diff -up cxmon-3.2/src/mon.cpp~ cxmon-3.2/src/mon.cpp
---- cxmon-3.2/src/mon.cpp~ 2010-02-21 12:58:33.000000000 +0100
-+++ cxmon-3.2/src/mon.cpp 2015-05-16 11:00:16.619745081 +0200
+diff -up cxmon-3.2/cxmon/src/mon.cpp~ cxmon-3.2/cxmon/src/mon.cpp
+--- cxmon-3.2/cxmon/src/mon.cpp~ 2010-02-21 12:58:33.000000000 +0100
++++ cxmon-3.2/cxmon/src/mon.cpp 2015-05-16 11:00:16.619745081 +0200
@@ -868,7 +868,7 @@ static void help_or_hunt()
}
fprintf(monout, "x Quit mon\n"
diff --git a/macemu-not-finding-cxmon.patch b/macemu-not-finding-cxmon.patch
new file mode 100644
index 0000000..b54913f
--- /dev/null
+++ b/macemu-not-finding-cxmon.patch
@@ -0,0 +1,38 @@
+diff -up
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/BasiliskII/src/Unix/configure.ac~
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/BasiliskII/src/Unix/configure.ac
+---
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/BasiliskII/src/Unix/configure.ac~ 2016-01-31
16:00:57.000000000 +0100
++++
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/BasiliskII/src/Unix/configure.ac 2016-03-22
10:26:00.590374903 +0100
+@@ -147,11 +147,11 @@ dnl We use mon if possible.
+ MONSRCS=
+ if [[ "x$WANT_MON" = "xyes" ]]; then
+ AC_MSG_CHECKING(for mon)
+- mon_srcdir=../../../mon/src
++ mon_srcdir=../../../cxmon/src
+ 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_disass.cpp $mon_srcdir/mon_ppc.cpp
$mon_srcdir/mon_lowmem.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"
++ 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/mon_lowmem.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"
+ AC_CHECK_LIB(ncurses, tgetent, ,
+ [AC_CHECK_LIB(termcap, tgetent, ,
+diff -up
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/Unix/configure.ac~
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/Unix/configure.ac
+---
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/Unix/configure.ac~ 2016-01-31
16:00:57.000000000 +0100
++++
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/Unix/configure.ac 2016-07-07
14:40:04.682720595 +0200
+@@ -114,7 +114,7 @@ x/* | x.*)
+ WANT_MON=yes
+ ;;
+ xyes)
+- mon_srcdir=../../../mon/src
++ mon_srcdir=../../../cxmon/src
+ ;;
+ esac
+ if [[ "x$WANT_MON" = "xyes" ]]; then
+@@ -122,7 +122,7 @@ 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 $mon_srcdir/disass/mips-dis.c
$mon_srcdir/disass/mips-opc.c $mon_srcdir/disass/mips16-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"
+ CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
+ AC_CHECK_LIB(ncurses, tgetent, ,
+ [AC_CHECK_LIB(termcap, tgetent, ,
diff --git a/sources b/sources
index ba0342e..86c8ac1 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-477d800bb4b36e90aa94c0d6810b8e53 cxmon-3.2-cvs20130310.tar.gz
-22e17876d74a37e1a9f19d2150170cee SheepShaver.png
-5afbe1c0a1e7b16ce503aad4ca14f298 macemu-master.zip
+2bd39d7dea7f3f39d272064c2e6ccd85 BasiliskII-1.0-b58a926.tar.gz