src/audio/SDL_mixer.c
changeset 1402 d910939febfa
parent 1358 c71e05b4dc2e
child 1442 e3242177fe4a
     1.1 --- a/src/audio/SDL_mixer.c	Tue Feb 21 08:34:45 2006 +0000
     1.2 +++ b/src/audio/SDL_mixer.c	Tue Feb 21 08:46:50 2006 +0000
     1.3 @@ -19,6 +19,7 @@
     1.4      Sam Lantinga
     1.5      slouken@libsdl.org
     1.6  */
     1.7 +#include "SDL_config.h"
     1.8  
     1.9  /* This provides the default mixing callback for the SDL audio routines */
    1.10  
    1.11 @@ -110,7 +111,7 @@
    1.12  	switch (format) {
    1.13  
    1.14  		case AUDIO_U8: {
    1.15 -#if defined(__M68000__) && defined(__GNUC__)
    1.16 +#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
    1.17  			SDL_MixAudio_m68k_U8((char*)dst,(char*)src,(unsigned long)len,(long)volume,(char *)mix8);
    1.18  #else
    1.19  			Uint8 src_sample;
    1.20 @@ -127,21 +128,21 @@
    1.21  		break;
    1.22  
    1.23  		case AUDIO_S8: {
    1.24 -#if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT)
    1.25 +#if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
    1.26  			if (SDL_HasMMX())
    1.27  			{
    1.28  				SDL_MixAudio_MMX_S8((char*)dst,(char*)src,(unsigned int)len,(int)volume);
    1.29  			}
    1.30  			else
    1.31  #endif
    1.32 -#if defined(USE_ASM_MIXER_VC)
    1.33 +#if defined(_MSC_VER) && defined(M_I86) && defined(SDL_ASSEMBLY_ROUTINES)
    1.34  			if (SDL_HasMMX())
    1.35  			{
    1.36  				SDL_MixAudio_MMX_S8_VC((char*)dst,(char*)src,(unsigned int)len,(int)volume);
    1.37  			}
    1.38  			else
    1.39  #endif
    1.40 -#if defined(__M68000__) && defined(__GNUC__)
    1.41 +#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
    1.42  			SDL_MixAudio_m68k_S8((char*)dst,(char*)src,(unsigned long)len,(long)volume);
    1.43  #else
    1.44  			{
    1.45 @@ -174,7 +175,7 @@
    1.46  		break;
    1.47  
    1.48  		case AUDIO_S16LSB: {
    1.49 -#if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT)
    1.50 +#if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
    1.51  			if (SDL_HasMMX())
    1.52  			{
    1.53  				SDL_MixAudio_MMX_S16((char*)dst,(char*)src,(unsigned int)len,(int)volume);
    1.54 @@ -187,7 +188,7 @@
    1.55  			}
    1.56  			else
    1.57  #endif
    1.58 -#if defined(__M68000__) && defined(__GNUC__)
    1.59 +#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
    1.60  			SDL_MixAudio_m68k_S16LSB((short*)dst,(short*)src,(unsigned long)len,(long)volume);
    1.61  #else
    1.62  			{
    1.63 @@ -220,7 +221,7 @@
    1.64  		break;
    1.65  
    1.66  		case AUDIO_S16MSB: {
    1.67 -#if defined(__M68000__) && defined(__GNUC__)
    1.68 +#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
    1.69  			SDL_MixAudio_m68k_S16MSB((short*)dst,(short*)src,(unsigned long)len,(long)volume);
    1.70  #else
    1.71  			Sint16 src1, src2;