--- a/Makefile	Mon Nov 29 19:26:24 2004 +0000
+++ b/Makefile	Mon Nov 29 20:03:04 2004 +0000
@@ -543,7 +543,8 @@
 ttd_OBJS = $(C_SOURCES:%.c=%.o) $(CXX_SOURCES:%.cpp=%.o)
 
 ifdef BEOS
-CXX_SOURCES += bemidi.cpp
+CXX_SOURCES += os/beos/bemidi.cpp
+CFLAGS += -I.
 endif
 
 ifdef WIN32
@@ -745,6 +746,6 @@
 		>> .deps/$(*F).P; \
 	rm .deps/$(*F).pp
 
-# For DirectMusic build
+# For DirectMusic build and BeOS specific parts
 %.o: %.cpp  $(MAKE_CONFIG)
-	$(CXX_BUILD) $<
+	$(CXX_BUILD) $< -o $@

--- a/bemidi.cpp	Mon Nov 29 19:26:24 2004 +0000
+++ b/bemidi.cpp	Mon Nov 29 20:03:04 2004 +0000
@@ -1,55 +0,0 @@
-#ifdef __BEOS__
-
-#include "stdafx.h"
-#include "ttd.h"
-#include "hal.h"
-
-// BeOS System Includes
-#include <MidiSynthFile.h>
-
-BMidiSynthFile midiSynthFile;
-
-static char *bemidi_start(char **parm)
-{
-	return NULL;
-}
-
-static void bemidi_stop(void)
-{
-	midiSynthFile.UnloadFile();
-}
-
-static void bemidi_play_song(const char *filename)
-{
-	bemidi_stop();
-	entry_ref midiRef;
-	get_ref_for_path(filename, &midiRef);
-	midiSynthFile.LoadFile(&midiRef);
-	midiSynthFile.Start();
-}
-
-static void bemidi_stop_song(void)
-{
-	midiSynthFile.UnloadFile();
-}
-
-static bool bemidi_is_playing(void)
-{
-	return !midiSynthFile.IsFinished();
-}
-
-static void bemidi_set_volume(byte vol)
-{
-	fprintf(stderr, "BeMidi: Set volume not implemented\n");
-}
-
-const HalMusicDriver _bemidi_music_driver = {
-	bemidi_start,
-	bemidi_stop,
-	bemidi_play_song,
-	bemidi_stop_song,
-	bemidi_is_playing,
-	bemidi_set_volume,
-};
-
-#endif // __BEOS__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/os/beos/bemidi.cpp	Mon Nov 29 20:03:04 2004 +0000
@@ -0,0 +1,55 @@
+#ifdef __BEOS__
+
+#include "stdafx.h"
+#include "ttd.h"
+#include "hal.h"
+
+// BeOS System Includes
+#include <MidiSynthFile.h>
+
+BMidiSynthFile midiSynthFile;
+
+static char *bemidi_start(char **parm)
+{
+	return NULL;
+}
+
+static void bemidi_stop(void)
+{
+	midiSynthFile.UnloadFile();
+}
+
+static void bemidi_play_song(const char *filename)
+{
+	bemidi_stop();
+	entry_ref midiRef;
+	get_ref_for_path(filename, &midiRef);
+	midiSynthFile.LoadFile(&midiRef);
+	midiSynthFile.Start();
+}
+
+static void bemidi_stop_song(void)
+{
+	midiSynthFile.UnloadFile();
+}
+
+static bool bemidi_is_playing(void)
+{
+	return !midiSynthFile.IsFinished();
+}
+
+static void bemidi_set_volume(byte vol)
+{
+	fprintf(stderr, "BeMidi: Set volume not implemented\n");
+}
+
+const HalMusicDriver _bemidi_music_driver = {
+	bemidi_start,
+	bemidi_stop,
+	bemidi_play_song,
+	bemidi_stop_song,
+	bemidi_is_playing,
+	bemidi_set_volume,
+};
+
+#endif // __BEOS__