aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2009-07-09 13:17:46 +0000
committerFilippos Karapetis2009-07-09 13:17:46 +0000
commit8a783bdd7602f8fa2718fb5967505b00812ed70d (patch)
treee88f9408e5ace46f13a6f2a4d02174bf5770f9a1 /engines
parent8a7a81ed30697fea81a22c544543295f65f43835 (diff)
downloadscummvm-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
Diffstat (limited to 'engines')
-rw-r--r--engines/parallaction/sound.h2
1 files changed, 1 insertions, 1 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"