Fixed some things to support MacOS port

svn-id: r4210

simon/midi.cpp

@@ -23,8 +23,13 @@
 #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) {

simon/simon.cpp

@@ -23,7 +23,11 @@
 #include "stdafx.h"
 #include "scummsys.h"
 #include "system.h"
+#ifndef macintosh
 #include "../sound/mixer.h"
+#else
+#include "mixer.h"
+#endif
 #include "simon.h"
 
 
@@ -34,7 +38,11 @@
 #ifdef WIN32
 #include <malloc.h>
 #endif
+#ifndef macintosh
 #include <sys/stat.h>
+#else
+#include <stat.h>
+#endif
 
 int sdl_mouse_x, sdl_mouse_y;
 

simon/simon.h

@@ -220,7 +220,7 @@ struct VgaFile1Struct0x6 {
 };
 
 /* dummy typedefs to make it compile in *nix */
-#if defined(UNIX) || defined(UNIX_X11) || defined(__MORPHOS__) || defined(__DC__) || defined(__APPLE__CW)
+#if defined(UNIX) || defined(UNIX_X11) || defined(__MORPHOS__) || defined(__DC__) || defined(macintosh)
 typedef void* HMIDISTRM;
 typedef void* HMIDIOUT;
 typedef uint32 UINT;

simon/simonsys.cpp

@@ -23,7 +23,11 @@
 #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>