aboutsummaryrefslogtreecommitdiff
path: root/sound/module.mk
diff options
context:
space:
mode:
authorMax Horn2007-06-16 16:46:13 +0000
committerMax Horn2007-06-16 16:46:13 +0000
commit6498d669d0597897951e4c9eebb73419750a94c4 (patch)
tree5f7fac25597dd03acea83f8c1e039144e14e2569 /sound/module.mk
parentc7c2cb498ccff9f67cd88f356d0050ce58af59d6 (diff)
downloadscummvm-rg350-6498d669d0597897951e4c9eebb73419750a94c4.tar.gz
scummvm-rg350-6498d669d0597897951e4c9eebb73419750a94c4.tar.bz2
scummvm-rg350-6498d669d0597897951e4c9eebb73419750a94c4.zip
Patch #1721826: ARM asm versions of sound rate conversion/mixing code
svn-id: r27467
Diffstat (limited to 'sound/module.mk')
-rw-r--r--sound/module.mk10
1 files changed, 9 insertions, 1 deletions
diff --git a/sound/module.mk b/sound/module.mk
index a204dbadb9..bcb822b86d 100644
--- a/sound/module.mk
+++ b/sound/module.mk
@@ -16,7 +16,6 @@ MODULE_OBJS := \
mp3.o \
mpu401.o \
null.o \
- rate.o \
voc.o \
vorbis.o \
wave.o \
@@ -31,5 +30,14 @@ MODULE_OBJS := \
softsynth/fluidsynth.o \
softsynth/mt32.o \
+ifndef USE_ARM_SOUND_ASM
+MODULE_OBJS += \
+ rate.o
+else
+MODULE_OBJS += \
+ rate_arm.o \
+ rate_arm_asm.o
+endif
+
# Include common rules
include $(srcdir)/rules.mk