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

6 files changed, 24 insertions, 18 deletions

diff --git a/sound/null_s.c b/sound/null_s.c
index 00f8c4039..f68c4b13a 100644
--- a/sound/null_s.c
+++ b/sound/null_s.c
@@ -1,8 +1,8 @@
 /* $Id$ */
 
-#include "stdafx.h"
-#include "openttd.h"
-#include "sound/null_s.h"
+#include "../stdafx.h"
+#include "../openttd.h"
+#include "null_s.h"
 
 static const char *NullSoundStart(const char * const *parm) { return NULL; }
 static void NullSoundStop(void) {}
diff --git a/sound/null_s.h b/sound/null_s.h
index 5f9a90a92..6ccd19aed 100644
--- a/sound/null_s.h
+++ b/sound/null_s.h
@@ -3,7 +3,7 @@
 #ifndef SOUND_NULL_H
 #define SOUND_NULL_H
 
-#include "hal.h"
+#include "../hal.h"
 
 extern const HalSoundDriver _null_sound_driver;
 
diff --git a/sound/sdl_s.c b/sound/sdl_s.c
index c9cb2b395..762be59b6 100644
--- a/sound/sdl_s.c
+++ b/sound/sdl_s.c
@@ -1,11 +1,14 @@
 /* $Id$ */
 
-#include "stdafx.h"
-#include "openttd.h"
-#include "driver.h"
-#include "mixer.h"
-#include "sdl.h"
-#include "sound/sdl_s.h"
+#include "../stdafx.h"
+
+#ifdef WITH_SDL
+
+#include "../openttd.h"
+#include "../driver.h"
+#include "../mixer.h"
+#include "../sdl.h"
+#include "sdl_s.h"
 #include <SDL.h>
 
 static void CDECL fill_sound_buffer(void *userdata, Uint8 *stream, int len)
@@ -40,3 +43,5 @@ const HalSoundDriver _sdl_sound_driver = {
 	SdlSoundStart,
 	SdlSoundStop,
 };
+
+#endif
diff --git a/sound/sdl_s.h b/sound/sdl_s.h
index 5808f68de..6fc2b6dc0 100644
--- a/sound/sdl_s.h
+++ b/sound/sdl_s.h
@@ -3,7 +3,7 @@
 #ifndef SOUND_SDL_H
 #define SOUND_SDL_H
 
-#include "hal.h"
+#include "../hal.h"
 
 extern const HalSoundDriver _sdl_sound_driver;
 
diff --git a/sound/win32_s.c b/sound/win32_s.c
index 736c00d9c..b32c2e746 100644
--- a/sound/win32_s.c
+++ b/sound/win32_s.c
@@ -1,12 +1,13 @@
 /* $Id$ */
 
-#include "stdafx.h"
-#include "openttd.h"
-#include "driver.h"
-#include "functions.h"
-#include "mixer.h"
-#include "sound/win32_s.h"
+#include "../stdafx.h"
+#include "../openttd.h"
+#include "../driver.h"
+#include "../functions.h"
+#include "../mixer.h"
+#include "win32_s.h"
 #include <windows.h>
+#include <mmsystem.h>
 
 static HWAVEOUT _waveout;
 static WAVEHDR _wave_hdr[2];
diff --git a/sound/win32_s.h b/sound/win32_s.h
index ff1cb1158..65c6a957d 100644
--- a/sound/win32_s.h
+++ b/sound/win32_s.h
@@ -3,7 +3,7 @@
 #ifndef SOUND_WIN32_H
 #define SOUND_WIN32_H
 
-#include "hal.h"
+#include "../hal.h"
 
 extern const HalSoundDriver _win32_sound_driver;