aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
authorMax Horn2002-05-05 20:04:26 +0000
committerMax Horn2002-05-05 20:04:26 +0000
commit2f2d4527efc63dffef87b2dd7826fde53a60897a (patch)
tree37fa0c90810a8db394ea2188379588e2cbf54141 /simon
parent816fe7116872ca65603aaf49340e55c89410507b (diff)
downloadscummvm-rg350-2f2d4527efc63dffef87b2dd7826fde53a60897a.tar.gz
scummvm-rg350-2f2d4527efc63dffef87b2dd7826fde53a60897a.tar.bz2
scummvm-rg350-2f2d4527efc63dffef87b2dd7826fde53a60897a.zip
cleaning up the mess drigo left... <sigh>
svn-id: r4215
Diffstat (limited to 'simon')
-rw-r--r--simon/midi.cpp5
-rw-r--r--simon/simon.cpp8
-rw-r--r--simon/simonsys.cpp4
3 files changed, 0 insertions, 17 deletions
diff --git a/simon/midi.cpp b/simon/midi.cpp
index c599e34700..c4acc1390a 100644
--- a/simon/midi.cpp
+++ b/simon/midi.cpp
@@ -23,13 +23,8 @@
#include "stdafx.h"
#include "scummsys.h"
#include "system.h"
-#ifndef macintosh
#include "../sound/mididrv.h"
#include "../sound/mixer.h"
-#else
-#include "mididrv.h"
-#include "mixer.h"
-#endif
#include "simon.h"
void MidiPlayer::read_from_file(void *dst, uint size) {
diff --git a/simon/simon.cpp b/simon/simon.cpp
index b7e7dc3f77..add8f42bb5 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -23,11 +23,7 @@
#include "stdafx.h"
#include "scummsys.h"
#include "system.h"
-#ifndef macintosh
#include "../sound/mixer.h"
-#else
-#include "mixer.h"
-#endif
#include "simon.h"
@@ -38,11 +34,7 @@
#ifdef WIN32
#include <malloc.h>
#endif
-#ifndef macintosh
#include <sys/stat.h>
-#else
-#include <stat.h>
-#endif
int sdl_mouse_x, sdl_mouse_y;
diff --git a/simon/simonsys.cpp b/simon/simonsys.cpp
index 8d29ad2214..cb7f34bc9e 100644
--- a/simon/simonsys.cpp
+++ b/simon/simonsys.cpp
@@ -23,11 +23,7 @@
#include "stdafx.h"
#include "scummsys.h"
#include "system.h"
-#ifndef macintosh
#include "../sound/mixer.h"
-#else
-#include "mixer.h"
-#endif
#include "simon.h"
#include <stdarg.h>