summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2014-05-03 20:21:01 +0000
committerrubidium <rubidium@openttd.org>2014-05-03 20:21:01 +0000
commitd2357ec435afc6f09ae7a98a42b389efa62e29f0 (patch)
tree221cc2409e0ccb8ffeb607271a5e859e71e9c350
parent77bc71aad52ec20787073042fad760e3dedefc83 (diff)
downloadopenttd-d2357ec435afc6f09ae7a98a42b389efa62e29f0.tar.xz
(svn r26556) -Codechange: use sources.list to tell a file shouldn't be built for a particular platform
-rw-r--r--source.list5
-rw-r--r--src/music/extmidi.cpp3
2 files changed, 4 insertions, 4 deletions
diff --git a/source.list b/source.list
index 17b937fb4..a06829fac 100644
--- a/source.list
+++ b/source.list
@@ -1108,7 +1108,10 @@ music/null_m.cpp
#else
#if DOS
#else
- music/extmidi.cpp
+ #if MORPHOS
+ #else
+ music/extmidi.cpp
+ #end
#end
#end
#end
diff --git a/src/music/extmidi.cpp b/src/music/extmidi.cpp
index 7b9e649c0..f4a35360c 100644
--- a/src/music/extmidi.cpp
+++ b/src/music/extmidi.cpp
@@ -9,7 +9,6 @@
/** @file extmidi.cpp Playing music via an external player. */
-#ifndef __MORPHOS__
#include "../stdafx.h"
#include "../debug.h"
#include "../string_func.h"
@@ -135,5 +134,3 @@ void MusicDriver_ExtMidi::DoStop()
waitpid(this->pid, NULL, 0);
this->pid = -1;
}
-
-#endif /* __MORPHOS__ */