aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorJohannes Schickel2009-05-05 21:40:50 +0000
committerJohannes Schickel2009-05-05 21:40:50 +0000
commitd9e0499a36004023dea3dfd95312b1d91eca5bbc (patch)
tree371485e428eb06466e8c1dda9265da5ea0cd1ed1 /sound
parentad38e0def05ac0bb82f8e4f9a1a6b5f952d5f8c1 (diff)
downloadscummvm-rg350-d9e0499a36004023dea3dfd95312b1d91eca5bbc.tar.gz
scummvm-rg350-d9e0499a36004023dea3dfd95312b1d91eca5bbc.tar.bz2
scummvm-rg350-d9e0499a36004023dea3dfd95312b1d91eca5bbc.zip
AdLib emulator changes part1 (breaks compilation :-/):
- Add new directory sound/softsynth/opl - Move sound/fmopl to sound/softsynth/opl/mame svn-id: r40333
Diffstat (limited to 'sound')
-rw-r--r--sound/module.mk2
-rw-r--r--sound/softsynth/opl/mame.cpp (renamed from sound/fmopl.cpp)0
-rw-r--r--sound/softsynth/opl/mame.h (renamed from sound/fmopl.h)0
3 files changed, 1 insertions, 1 deletions
diff --git a/sound/module.mk b/sound/module.mk
index bcf101d78e..1d7c2ffc31 100644
--- a/sound/module.mk
+++ b/sound/module.mk
@@ -7,7 +7,6 @@ MODULE_OBJS := \
audiostream.o \
iff.o \
flac.o \
- fmopl.o \
mididrv.o \
midiparser.o \
midiparser_smf.o \
@@ -30,6 +29,7 @@ MODULE_OBJS := \
mods/rjp1.o \
mods/soundfx.o \
softsynth/adlib.o \
+ softsynth/opl/mame.o \
softsynth/ym2612.o \
softsynth/fluidsynth.o \
softsynth/mt32.o \
diff --git a/sound/fmopl.cpp b/sound/softsynth/opl/mame.cpp
index 4834e586c3..4834e586c3 100644
--- a/sound/fmopl.cpp
+++ b/sound/softsynth/opl/mame.cpp
diff --git a/sound/fmopl.h b/sound/softsynth/opl/mame.h
index 47f21c9956..47f21c9956 100644
--- a/sound/fmopl.h
+++ b/sound/softsynth/opl/mame.h