diff options
| author | Filippos Karapetis | 2009-07-09 13:17:46 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-07-09 13:17:46 +0000 |
| commit | 8a783bdd7602f8fa2718fb5967505b00812ed70d (patch) | |
| tree | e88f9408e5ace46f13a6f2a4d02174bf5770f9a1 | |
| parent | 8a7a81ed30697fea81a22c544543295f65f43835 (diff) | |
| download | scummvm-rg350-8a783bdd7602f8fa2718fb5967505b00812ed70d.tar.gz scummvm-rg350-8a783bdd7602f8fa2718fb5967505b00812ed70d.tar.bz2 scummvm-rg350-8a783bdd7602f8fa2718fb5967505b00812ed70d.zip | |
Renamed sound/iff.* to sound/iff_sound.* to fix an issue with the upcoming changes to the MSVC project files (sound/iff.* produces iff.obj, which clashes with iff.obj from graphics/iff.*)
svn-id: r42287
| -rw-r--r-- | engines/parallaction/sound.h | 2 | ||||
| -rw-r--r-- | sound/iff_sound.cpp (renamed from sound/iff.cpp) | 2 | ||||
| -rw-r--r-- | sound/iff_sound.h (renamed from sound/iff.h) | 0 | ||||
| -rw-r--r-- | sound/module.mk | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/engines/parallaction/sound.h b/engines/parallaction/sound.h index 8fcfb94a9a..5a2c5e1c38 100644 --- a/engines/parallaction/sound.h +++ b/engines/parallaction/sound.h @@ -30,7 +30,7 @@ #include "common/mutex.h" #include "sound/audiostream.h" -#include "sound/iff.h" +#include "sound/iff_sound.h" #include "sound/mixer.h" #include "sound/mididrv.h" diff --git a/sound/iff.cpp b/sound/iff_sound.cpp index 1df58b178c..60a1486ed5 100644 --- a/sound/iff.cpp +++ b/sound/iff_sound.cpp @@ -23,7 +23,7 @@ * */ -#include "sound/iff.h" +#include "sound/iff_sound.h" #include "sound/audiostream.h" #include "sound/mixer.h" #include "common/func.h" diff --git a/sound/iff.h b/sound/iff_sound.h index 82106cb75e..82106cb75e 100644 --- a/sound/iff.h +++ b/sound/iff_sound.h diff --git a/sound/module.mk b/sound/module.mk index dba9501a38..3bcdd47c56 100644 --- a/sound/module.mk +++ b/sound/module.mk @@ -5,7 +5,7 @@ MODULE_OBJS := \ aiff.o \ audiocd.o \ audiostream.o \ - iff.o \ + iff_sound.o \ flac.o \ fmopl.o \ mididrv.o \ |