summaryrefslogtreecommitdiffstats
path: root/firmware/pcm_mixer.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2011-06-29 07:47:29 +0000
committerMichael Sevakis <jethead71@rockbox.org>2011-06-29 07:47:29 +0000
commit40ff07140de0afa86ff3e0c29ee24e0e012f0c42 (patch)
treeb3d58cd1bfec685eefdf98f432b2fbc2da8c4077 /firmware/pcm_mixer.c
parent7996d6d3f99ad80385fdc85438d23139e5569d3c (diff)
downloadrockbox-40ff07140de0afa86ff3e0c29ee24e0e012f0c42.tar.gz
rockbox-40ff07140de0afa86ff3e0c29ee24e0e012f0c42.tar.bz2
rockbox-40ff07140de0afa86ff3e0c29ee24e0e012f0c42.zip
Get android to build. Forgo optimized mixing code for app builds for the moment; work it out later.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30099 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/pcm_mixer.c')
-rw-r--r--firmware/pcm_mixer.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/firmware/pcm_mixer.c b/firmware/pcm_mixer.c
index cddd3f0f86..e5625fbd32 100644
--- a/firmware/pcm_mixer.c
+++ b/firmware/pcm_mixer.c
@@ -71,6 +71,8 @@ static unsigned int idle_counter = 0;
({ start = (void *)(((uintptr_t)start + 3) & ~3); \
size &= ~3; })
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
+
/* Include any implemented CPU-optimized mixdown routines */
#if defined(CPU_ARM)
#if ARM_ARCH >= 6
@@ -84,6 +86,7 @@ static unsigned int idle_counter = 0;
#include "pcm-mixer-coldfire.c"
#endif /* CPU_* */
+#endif /* CONFIG_PLATFORM */
/** Generic mixing routines **/