(svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...

Makefile

@@ -709,23 +709,23 @@ C_SOURCES += water_cmd.c
 C_SOURCES += waypoint.c
 C_SOURCES += widget.c
 C_SOURCES += window.c
-C_SOURCES += music/null.c
+C_SOURCES += music/null_m.c
-C_SOURCES += sound/null.c
+C_SOURCES += sound/null_s.c
-C_SOURCES += video/null.c
+C_SOURCES += video/null_v.c
 
 CXX_SOURCES =
 
 ifdef WITH_SDL
 C_SOURCES += sdl.c
-C_SOURCES += sound/sdl.c
+C_SOURCES += sound/sdl_s.c
-C_SOURCES += video/sdl.c
+C_SOURCES += video/sdl_v.c
 endif
 
 ifdef WIN32
 C_SOURCES += win32.c
-C_SOURCES += music/win32.c
+C_SOURCES += music/win32_m.c
-C_SOURCES += sound/win32.c
+C_SOURCES += sound/win32_s.c
-C_SOURCES += video/win32.c
+C_SOURCES += video/win32_v.c
 else
 C_SOURCES += unix.c
 C_SOURCES += music/extmidi.c

music/null_m.c

@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
-#include "music/null.h"
+#include "music/null_m.h"
 
 static const char* NullMidiStart(const char* const* parm) { return NULL; }
 static void NullMidiStop(void) {}

music/win32_m.c

@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
-#include "music/win32.h"
+#include "music/win32_m.h"
 #include <windows.h>
 
 static struct {

sound/null_s.c

@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
-#include "sound/null.h"
+#include "sound/null_s.h"
 
 static const char *NullSoundStart(const char * const *parm) { return NULL; }
 static void NullSoundStop(void) {}

sound/sdl_s.c

@@ -3,7 +3,7 @@
 #include "driver.h"
 #include "mixer.h"
 #include "sdl.h"
-#include "sound/sdl.h"
+#include "sound/sdl_s.h"
 #include <SDL.h>
 
 static void CDECL fill_sound_buffer(void *userdata, Uint8 *stream, int len)

sound/win32_s.c

@@ -3,7 +3,7 @@
 #include "driver.h"
 #include "functions.h"
 #include "mixer.h"
-#include "sound/win32.h"
+#include "sound/win32_s.h"
 #include <windows.h>
 
 static HWAVEOUT _waveout;

unix.c

@@ -8,13 +8,13 @@
 #include "variables.h"
 
 #include "music/extmidi.h"
-#include "music/null.h"
+#include "music/null_m.h"
 
-#include "sound/null.h"
+#include "sound/null_s.h"
-#include "sound/sdl.h"
+#include "sound/sdl_s.h"
 
-#include "video/null.h"
+#include "video/null_v.h"
-#include "video/sdl.h"
+#include "video/sdl_v.h"
 
 #include <dirent.h>
 #include <unistd.h>

video/null_v.c

@@ -2,7 +2,7 @@
 #include "openttd.h"
 #include "gfx.h"
 #include "variables.h"
-#include "video/null.h"
+#include "video/null_v.h"
 #include "window.h"
 
 static void* _null_video_mem = NULL;

video/sdl_v.c

@@ -6,7 +6,7 @@
 #include "macros.h"
 #include "sdl.h"
 #include "window.h"
-#include "video/sdl.h"
+#include "video/sdl_v.h"
 #include <SDL.h>
 #include "network.h"
 #include "variables.h"

video/win32_v.c

@@ -6,7 +6,7 @@
 #include "network.h"
 #include "variables.h"
 #include "window.h"
-#include "video/win32.h"
+#include "video/win32_v.h"
 #include <windows.h>
 
 static struct {

win32.c

@@ -18,14 +18,14 @@
 #include "driver.h"
 
 #include "music/dmusic.h"
-#include "music/null.h"
+#include "music/null_m.h"
-#include "music/win32.h"
+#include "music/win32_m.h"
 
-#include "sound/null.h"
+#include "sound/null_s.h"
-#include "sound/win32.h"
+#include "sound/win32_s.h"
 
-#include "video/null.h"
+#include "video/null_v.h"
-#include "video/win32.h"
+#include "video/win32_v.h"
 
 static bool _has_console;