diff src/audio/SDL_mixer_MMX_VC.h @ 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.h	Sun Jan 10 07:40:12 2010 +0000
+++ b/src/audio/SDL_mixer_MMX_VC.h	Sun Jan 10 07:48:14 2010 +0000
@@ -21,7 +21,7 @@
 */
 #include "SDL_config.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)
 /* headers for MMX assembler version of SDL_MixAudio
    Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr)
@@ -34,4 +34,6 @@
 void SDL_MixAudio_MMX_S16_VC(char *, char *, unsigned int, int);
 void SDL_MixAudio_MMX_S8_VC(char *, char *, unsigned int, int);
 #endif
+#endif /* SDL_BUGGY_MMX_MIXERS */
+
 /* vi: set ts=4 sw=4 expandtab: */