(svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build

11 files changed, 28 insertions, 28 deletions

diff --git a/music/bemidi.h b/music/bemidi.h
index 5cca9e46d..10ead59ff 100644
--- a/music/bemidi.h
+++ b/music/bemidi.h
@@ -3,7 +3,7 @@
 #ifndef MUSIC_BEMIDI_H
 #define MUSIC_BEMIDI_H
 
-#include "hal.h"
+#include "../hal.h"
 
 extern const HalMusicDriver _bemidi_music_driver;
 
diff --git a/music/dmusic.c b/music/dmusic.c
index 0880fdc7a..357b667b3 100644
--- a/music/dmusic.c
+++ b/music/dmusic.c
@@ -26,15 +26,15 @@
 /* DirectMusic driver for Win32 */
 /* Based on dxmci from TTDPatch */
 
-#include "stdafx.h"
+#include "../stdafx.h"
 
 #ifdef WIN32_ENABLE_DIRECTMUSIC_SUPPORT
 
-#include "openttd.h"
-#include "string.h"
-#include "variables.h"
-#include "sound.h"
-#include "music/dmusic.h"
+#include "../openttd.h"
+#include "../string.h"
+#include "../variables.h"
+#include "../sound.h"
+#include "dmusic.h"
 
 static const char * DMusicMidiStart(const char * const *parm);
 static void DMusicMidiStop(void);
diff --git a/music/dmusic.h b/music/dmusic.h
index f4eec306d..5d0990137 100644
--- a/music/dmusic.h
+++ b/music/dmusic.h
@@ -3,7 +3,7 @@
 #ifndef MUSIC_DMUSIC_H
 #define MUSIC_DMUSIC_H
 
-#include "hal.h"
+#include "../hal.h"
 
 extern const HalMusicDriver _dmusic_midi_driver;
 
diff --git a/music/extmidi.c b/music/extmidi.c
index d976b6fa6..1e04e356b 100644
--- a/music/extmidi.c
+++ b/music/extmidi.c
@@ -2,13 +2,12 @@
 
 #ifndef __BEOS__
 #ifndef __MORPHOS__
-#include "stdafx.h"
-
-#include "openttd.h"
-#include "music/extmidi.h"
-#include "sound.h"
-#include "string.h"
-#include "variables.h"
+#include "../stdafx.h"
+#include "../openttd.h"
+#include "../sound.h"
+#include "../string.h"
+#include "../variables.h"
+#include "extmidi.h"
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/music/extmidi.h b/music/extmidi.h
index a4feba16f..681c34bd6 100644
--- a/music/extmidi.h
+++ b/music/extmidi.h
@@ -3,7 +3,7 @@
 #ifndef MUSIC_EXTERNAL_H
 #define MUSIC_EXTERNAL_H
 
-#include "hal.h"
+#include "../hal.h"
 
 extern const HalMusicDriver _extmidi_music_driver;
 
diff --git a/music/null_m.c b/music/null_m.c
index a1fec1f72..c76a60211 100644
--- a/music/null_m.c
+++ b/music/null_m.c
@@ -1,8 +1,8 @@
 /* $Id$ */
 
-#include "stdafx.h"
-#include "openttd.h"
-#include "music/null_m.h"
+#include "../stdafx.h"
+#include "../openttd.h"
+#include "null_m.h"
 
 static const char* NullMidiStart(const char* const* parm) { return NULL; }
 static void NullMidiStop(void) {}
diff --git a/music/null_m.h b/music/null_m.h
index 62f6036a9..0f3e2cfa5 100644
--- a/music/null_m.h
+++ b/music/null_m.h
@@ -3,7 +3,7 @@
 #ifndef MUSIC_NULL_H
 #define MUSIC_NULL_H
 
-#include "hal.h"
+#include "../hal.h"
 
 extern const HalMusicDriver _null_music_driver;
 
diff --git a/music/os2_m.c b/music/os2_m.c
index 1d4d3fb83..ef2559260 100644
--- a/music/os2_m.c
+++ b/music/os2_m.c
@@ -1,8 +1,8 @@
 /* $Id$ */
 
-#include "stdafx.h"
-#include "openttd.h"
-#include "music/os2_m.h"
+#include "../stdafx.h"
+#include "../openttd.h"
+#include "os2_m.h"
 
 #define INCL_DOS
 #define INCL_OS2MM
diff --git a/music/os2_m.h b/music/os2_m.h
index 3e5a83c0b..173f096a5 100644
--- a/music/os2_m.h
+++ b/music/os2_m.h
@@ -3,7 +3,7 @@
 #ifndef MUSIC_OS2_H
 #define MUSIC_OS2_H
 
-#include "hal.h"
+#include "../hal.h"
 
 extern const HalMusicDriver _os2_music_driver;
 
diff --git a/music/win32_m.c b/music/win32_m.c
index 8edfc55c7..3ec1d5ec2 100644
--- a/music/win32_m.c
+++ b/music/win32_m.c
@@ -1,9 +1,10 @@
 /* $Id$ */
 
-#include "stdafx.h"
-#include "openttd.h"
-#include "music/win32_m.h"
+#include "../stdafx.h"
+#include "../openttd.h"
+#include "win32_m.h"
 #include <windows.h>
+#include <mmsystem.h>
 
 static struct {
 	bool stop_song;
diff --git a/music/win32_m.h b/music/win32_m.h
index 56a558f2c..83893ed1e 100644
--- a/music/win32_m.h
+++ b/music/win32_m.h
@@ -3,7 +3,7 @@
 #ifndef MUSIC_WIN32_H
 #define MUSIC_WIN32_H
 
-#include "hal.h"
+#include "../hal.h"
 
 extern const HalMusicDriver _win32_music_driver;