comparison src/audio/SDL_mixer.c @ 4382:6599c89de50c SDL-1.2

Forgot a check for Coldfire CPU
author Patrice Mandin <patmandin@gmail.com>
date Mon, 09 Nov 2009 18:02:32 +0000
parents 124629b76853
children
comparison
equal deleted inserted replaced
4381:5425a6fbacf8 4382:6599c89de50c
224 #endif 224 #endif
225 } 225 }
226 break; 226 break;
227 227
228 case AUDIO_S16MSB: { 228 case AUDIO_S16MSB: {
229 #if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES) 229 #if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
230 SDL_MixAudio_m68k_S16MSB((short*)dst,(short*)src,(unsigned long)len,(long)volume); 230 SDL_MixAudio_m68k_S16MSB((short*)dst,(short*)src,(unsigned long)len,(long)volume);
231 #else 231 #else
232 Sint16 src1, src2; 232 Sint16 src1, src2;
233 int dst_sample; 233 int dst_sample;
234 const int max_audioval = ((1<<(16-1))-1); 234 const int max_audioval = ((1<<(16-1))-1);