From 10fd03e222dfd78abd7e9c78a215d4b8bc36cf3b Mon Sep 17 00:00:00 2001 From: tron Date: Sat, 23 Jul 2005 15:48:00 +0000 Subject: [PATCH] (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my... --- Makefile | 16 ++++++++-------- music/{null.c => null_m.c} | 2 +- music/{null.h => null_m.h} | 0 music/{win32.c => win32_m.c} | 2 +- music/{win32.h => win32_m.h} | 0 sound/{null.c => null_s.c} | 2 +- sound/{null.h => null_s.h} | 0 sound/{sdl.c => sdl_s.c} | 2 +- sound/{sdl.h => sdl_s.h} | 0 sound/{win32.c => win32_s.c} | 2 +- sound/{win32.h => win32_s.h} | 0 unix.c | 10 +++++----- video/{null.c => null_v.c} | 2 +- video/{null.h => null_v.h} | 0 video/{sdl.c => sdl_v.c} | 2 +- video/{sdl.h => sdl_v.h} | 0 video/{win32.c => win32_v.c} | 2 +- video/{win32.h => win32_v.h} | 0 win32.c | 12 ++++++------ 19 files changed, 27 insertions(+), 27 deletions(-) rename music/{null.c => null_m.c} (95%) rename music/{null.h => null_m.h} (100%) rename music/{win32.c => win32_m.c} (99%) rename music/{win32.h => win32_m.h} (100%) rename sound/{null.c => null_s.c} (90%) rename sound/{null.h => null_s.h} (100%) rename sound/{sdl.c => sdl_s.c} (96%) rename sound/{sdl.h => sdl_s.h} (100%) rename sound/{win32.c => win32_s.c} (98%) rename sound/{win32.h => win32_s.h} (100%) rename video/{null.c => null_v.c} (97%) rename video/{null.h => null_v.h} (100%) rename video/{sdl.c => sdl_v.c} (99%) rename video/{sdl.h => sdl_v.h} (100%) rename video/{win32.c => win32_v.c} (99%) rename video/{win32.h => win32_v.h} (100%) diff --git a/Makefile b/Makefile index f3dbab12b1..32287178f2 100644 --- a/Makefile +++ b/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 += sound/null.c -C_SOURCES += video/null.c +C_SOURCES += music/null_m.c +C_SOURCES += sound/null_s.c +C_SOURCES += video/null_v.c CXX_SOURCES = ifdef WITH_SDL C_SOURCES += sdl.c -C_SOURCES += sound/sdl.c -C_SOURCES += video/sdl.c +C_SOURCES += sound/sdl_s.c +C_SOURCES += video/sdl_v.c endif ifdef WIN32 C_SOURCES += win32.c -C_SOURCES += music/win32.c -C_SOURCES += sound/win32.c -C_SOURCES += video/win32.c +C_SOURCES += music/win32_m.c +C_SOURCES += sound/win32_s.c +C_SOURCES += video/win32_v.c else C_SOURCES += unix.c C_SOURCES += music/extmidi.c diff --git a/music/null.c b/music/null_m.c similarity index 95% rename from music/null.c rename to music/null_m.c index 136f1d3e25..fda44fdae9 100644 --- a/music/null.c +++ b/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) {} diff --git a/music/null.h b/music/null_m.h similarity index 100% rename from music/null.h rename to music/null_m.h diff --git a/music/win32.c b/music/win32_m.c similarity index 99% rename from music/win32.c rename to music/win32_m.c index eb4d42d252..73cb859a38 100644 --- a/music/win32.c +++ b/music/win32_m.c @@ -1,6 +1,6 @@ #include "stdafx.h" #include "openttd.h" -#include "music/win32.h" +#include "music/win32_m.h" #include static struct { diff --git a/music/win32.h b/music/win32_m.h similarity index 100% rename from music/win32.h rename to music/win32_m.h diff --git a/sound/null.c b/sound/null_s.c similarity index 90% rename from sound/null.c rename to sound/null_s.c index e7d0c8c107..744a209bdf 100644 --- a/sound/null.c +++ b/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) {} diff --git a/sound/null.h b/sound/null_s.h similarity index 100% rename from sound/null.h rename to sound/null_s.h diff --git a/sound/sdl.c b/sound/sdl_s.c similarity index 96% rename from sound/sdl.c rename to sound/sdl_s.c index 2f227ad39f..9ff1ca5cb1 100644 --- a/sound/sdl.c +++ b/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 static void CDECL fill_sound_buffer(void *userdata, Uint8 *stream, int len) diff --git a/sound/sdl.h b/sound/sdl_s.h similarity index 100% rename from sound/sdl.h rename to sound/sdl_s.h diff --git a/sound/win32.c b/sound/win32_s.c similarity index 98% rename from sound/win32.c rename to sound/win32_s.c index 9d58515a3a..a67249fa58 100644 --- a/sound/win32.c +++ b/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 static HWAVEOUT _waveout; diff --git a/sound/win32.h b/sound/win32_s.h similarity index 100% rename from sound/win32.h rename to sound/win32_s.h diff --git a/unix.c b/unix.c index bdbd7112e6..d49fc5143d 100644 --- a/unix.c +++ b/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/sdl.h" +#include "sound/null_s.h" +#include "sound/sdl_s.h" -#include "video/null.h" -#include "video/sdl.h" +#include "video/null_v.h" +#include "video/sdl_v.h" #include #include diff --git a/video/null.c b/video/null_v.c similarity index 97% rename from video/null.c rename to video/null_v.c index bbd839cc03..47dcb3c611 100644 --- a/video/null.c +++ b/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; diff --git a/video/null.h b/video/null_v.h similarity index 100% rename from video/null.h rename to video/null_v.h diff --git a/video/sdl.c b/video/sdl_v.c similarity index 99% rename from video/sdl.c rename to video/sdl_v.c index 5dc3a8cd4d..549acd3fb3 100644 --- a/video/sdl.c +++ b/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 #include "network.h" #include "variables.h" diff --git a/video/sdl.h b/video/sdl_v.h similarity index 100% rename from video/sdl.h rename to video/sdl_v.h diff --git a/video/win32.c b/video/win32_v.c similarity index 99% rename from video/win32.c rename to video/win32_v.c index d7d21b80bd..eb9e37a505 100644 --- a/video/win32.c +++ b/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 static struct { diff --git a/video/win32.h b/video/win32_v.h similarity index 100% rename from video/win32.h rename to video/win32_v.h diff --git a/win32.c b/win32.c index 3ad0686c7e..094e544ff7 100644 --- a/win32.c +++ b/win32.c @@ -18,14 +18,14 @@ #include "driver.h" #include "music/dmusic.h" -#include "music/null.h" -#include "music/win32.h" +#include "music/null_m.h" +#include "music/win32_m.h" -#include "sound/null.h" -#include "sound/win32.h" +#include "sound/null_s.h" +#include "sound/win32_s.h" -#include "video/null.h" -#include "video/win32.h" +#include "video/null_v.h" +#include "video/win32_v.h" static bool _has_console;