diff options
| author | vanfanel | 2015-11-11 17:56:12 +0100 |
|---|---|---|
| committer | vanfanel | 2015-11-11 17:56:12 +0100 |
| commit | 99739a13fe844c807d3cdd87e67e207e888fd48a (patch) | |
| tree | 6afbf4763326277efbf528f0bb9e587bf7a01788 /audio/module.mk | |
| parent | 37e157a11c3fc731dfdcf6ec6b6a5a448550219b (diff) | |
| parent | 7e44493fe8877a3c6a65f83b9ed84a5f59169005 (diff) | |
| download | scummvm-rg350-99739a13fe844c807d3cdd87e67e207e888fd48a.tar.gz scummvm-rg350-99739a13fe844c807d3cdd87e67e207e888fd48a.tar.bz2 scummvm-rg350-99739a13fe844c807d3cdd87e67e207e888fd48a.zip | |
Merge branch 'master' into dispmanx
Diffstat (limited to 'audio/module.mk')
| -rw-r--r-- | audio/module.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/audio/module.mk b/audio/module.mk index 4e1c031c83..9e002d57ba 100644 --- a/audio/module.mk +++ b/audio/module.mk @@ -1,6 +1,7 @@ MODULE := audio MODULE_OBJS := \ + adlib.o \ audiostream.o \ fmopl.o \ mididrv.o \ @@ -9,11 +10,14 @@ MODULE_OBJS := \ midiparser_xmidi.o \ midiparser.o \ midiplayer.o \ + miles_adlib.o \ + miles_mt32.o \ mixer.o \ mpu401.o \ musicplugin.o \ null.o \ timestamp.o \ + decoders/3do.o \ decoders/aac.o \ decoders/adpcm.o \ decoders/aiff.o \ @@ -36,7 +40,6 @@ MODULE_OBJS := \ mods/rjp1.o \ mods/soundfx.o \ mods/tfmx.o \ - softsynth/adlib.o \ softsynth/cms.o \ softsynth/opl/dbopl.o \ softsynth/opl/dosbox.o \ @@ -55,6 +58,11 @@ MODULE_OBJS := \ softsynth/sid.o \ softsynth/wave6581.o +ifdef USE_ALSA +MODULE_OBJS += \ + alsa_opl.o +endif + ifndef USE_ARM_SOUND_ASM MODULE_OBJS += \ rate.o |