Mercurial > sdl-ios-xcode
diff src/audio/SDL_mixer_MMX_VC.c @ 3628:4d46850be3f6
Merged r5070:5071 from branches/SDL-1.2: forcibly disable buggy MMX mixers.
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Sun, 10 Jan 2010 07:48:14 +0000 |
| parents | 99210400e8b9 |
| children | f7b03b6838cb |
line wrap: on
line diff
--- a/src/audio/SDL_mixer_MMX_VC.c Sun Jan 10 07:40:12 2010 +0000 +++ b/src/audio/SDL_mixer_MMX_VC.c Sun Jan 10 07:48:14 2010 +0000 @@ -23,6 +23,7 @@ #include "SDL_mixer_MMX_VC.h" +#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */ #if ((defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)) && defined(SDL_ASSEMBLY_ROUTINES) // MMX assembler version of SDL_MixAudio for signed little endian 16 bit samples and signed 8 bit samples // Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr) @@ -184,5 +185,6 @@ } #endif /* SDL_ASSEMBLY_ROUTINES */ +#endif /* SDL_BUGGY_MMX_MIXERS */ /* vi: set ts=4 sw=4 expandtab: */