Removed buggy and LGPL MMX mixing routines.

14 files changed, 39 insertions, 1314 deletions

diff --git a/Makefile.ds b/Makefile.ds
index 7704f26a..73873871 100644
--- a/Makefile.ds
+++ b/Makefile.ds
@@ -84,9 +84,6 @@ CFILES		:=	\
 			audio/SDL_audiodev.c \
 			audio/SDL_audiotypecvt.c \
 			audio/SDL_mixer.c \
-			audio/SDL_mixer_MMX.c \
-			audio/SDL_mixer_MMX_VC.c \
-			audio/SDL_mixer_m68k.c \
 			audio/SDL_wave.c \
 			audio/nds/SDL_ndsaudio.c \
 			cpuinfo/SDL_cpuinfo.c \
diff --git a/VisualC/SDL/SDL_VS2005.vcproj b/VisualC/SDL/SDL_VS2005.vcproj
index 98686eb0..d512b16e 100644
--- a/VisualC/SDL/SDL_VS2005.vcproj
+++ b/VisualC/SDL/SDL_VS2005.vcproj
@@ -940,30 +940,6 @@
 			>

 		</File>

 		<File

-			RelativePath="..\..\src\audio\SDL_mixer_m68k.c"

-			>

-		</File>

-		<File

-			RelativePath="..\..\src\audio\SDL_mixer_m68k.h"

-			>

-		</File>

-		<File

-			RelativePath="..\..\src\audio\SDL_mixer_MMX.c"

-			>

-		</File>

-		<File

-			RelativePath="..\..\src\audio\SDL_mixer_MMX.h"

-			>

-		</File>

-		<File

-			RelativePath="..\..\src\audio\SDL_mixer_MMX_VC.c"

-			>

-		</File>

-		<File

-			RelativePath="..\..\src\audio\SDL_mixer_MMX_VC.h"

-			>

-		</File>

-		<File

 			RelativePath="..\..\src\joystick\windows\SDL_mmjoystick.c"

 			>

 		</File>

diff --git a/VisualC/SDL/SDL_VS2008.vcproj b/VisualC/SDL/SDL_VS2008.vcproj
index 012b7ec4..4c16d7bc 100644
--- a/VisualC/SDL/SDL_VS2008.vcproj
+++ b/VisualC/SDL/SDL_VS2008.vcproj
@@ -929,30 +929,6 @@
 			>

 		</File>

 		<File

-			RelativePath="..\..\src\audio\SDL_mixer_m68k.c"

-			>

-		</File>

-		<File

-			RelativePath="..\..\src\audio\SDL_mixer_m68k.h"

-			>

-		</File>

-		<File

-			RelativePath="..\..\src\audio\SDL_mixer_MMX.c"

-			>

-		</File>

-		<File

-			RelativePath="..\..\src\audio\SDL_mixer_MMX.h"

-			>

-		</File>

-		<File

-			RelativePath="..\..\src\audio\SDL_mixer_MMX_VC.c"

-			>

-		</File>

-		<File

-			RelativePath="..\..\src\audio\SDL_mixer_MMX_VC.h"

-			>

-		</File>

-		<File

 			RelativePath="..\..\src\joystick\windows\SDL_mmjoystick.c"

 			>

 		</File>

diff --git a/VisualC/SDL/SDL_VS2010.vcxproj b/VisualC/SDL/SDL_VS2010.vcxproj
index 918160c6..24e5a646 100644
--- a/VisualC/SDL/SDL_VS2010.vcxproj
+++ b/VisualC/SDL/SDL_VS2010.vcxproj
@@ -295,9 +295,6 @@
     <ClInclude Include="..\..\src\video\SDL_glfuncs.h" />

     <ClInclude Include="..\..\src\joystick\SDL_joystick_c.h" />

     <ClInclude Include="..\..\src\events\SDL_keyboard_c.h" />

-    <ClInclude Include="..\..\src\audio\SDL_mixer_m68k.h" />

-    <ClInclude Include="..\..\src\audio\SDL_mixer_MMX.h" />

-    <ClInclude Include="..\..\src\audio\SDL_mixer_MMX_VC.h" />

     <ClInclude Include="..\..\src\events\SDL_mouse_c.h" />

     <ClInclude Include="..\..\src\video\dummy\SDL_nullevents_c.h" />

     <ClInclude Include="..\..\src\video\dummy\SDL_nullvideo.h" />

@@ -403,9 +400,6 @@
     <ClCompile Include="..\..\src\events\SDL_keyboard.c" />

     <ClCompile Include="..\..\src\stdlib\SDL_malloc.c" />

     <ClCompile Include="..\..\src\audio\SDL_mixer.c" />

-    <ClCompile Include="..\..\src\audio\SDL_mixer_m68k.c" />

-    <ClCompile Include="..\..\src\audio\SDL_mixer_MMX.c" />

-    <ClCompile Include="..\..\src\audio\SDL_mixer_MMX_VC.c" />

     <ClCompile Include="..\..\src\joystick\windows\SDL_mmjoystick.c" />

     <ClCompile Include="..\..\src\events\SDL_mouse.c" />

     <ClCompile Include="..\..\src\video\dummy\SDL_nullevents.c" />

@@ -450,4 +444,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

-</Project>
\ No newline at end of file
+</Project>

diff --git a/VisualCE/SDL/SDL.vcp b/VisualCE/SDL/SDL.vcp
index 7527b39f..231ff812 100644
--- a/VisualCE/SDL/SDL.vcp
+++ b/VisualCE/SDL/SDL.vcp
@@ -20730,9 +20730,6 @@ SOURCE=..\..\src\audio\SDL_mixer.c
 !IF  "$(CFG)" == "SDL - Win32 (WCE MIPSII_FP) Release"

 

 DEP_CPP_SDL_MI=\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 NODEP_CPP_SDL_MI=\

@@ -20753,9 +20750,6 @@ NODEP_CPP_SDL_MI=\
 !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSII_FP) Debug"

 

 DEP_CPP_SDL_MI=\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 NODEP_CPP_SDL_MI=\

@@ -20776,9 +20770,6 @@ NODEP_CPP_SDL_MI=\
 !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSII) Release"

 

 DEP_CPP_SDL_MI=\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 NODEP_CPP_SDL_MI=\

@@ -20799,9 +20790,6 @@ NODEP_CPP_SDL_MI=\
 !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSII) Debug"

 

 DEP_CPP_SDL_MI=\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 NODEP_CPP_SDL_MI=\

@@ -20824,9 +20812,6 @@ NODEP_CPP_SDL_MI=\
 DEP_CPP_SDL_MI=\

 	"..\..\include\SDL_cpuinfo.h"\

 	"..\..\include\SDL_thread.h"\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 NODEP_CPP_SDL_MI=\

@@ -20847,9 +20832,6 @@ NODEP_CPP_SDL_MI=\
 DEP_CPP_SDL_MI=\

 	"..\..\include\SDL_cpuinfo.h"\

 	"..\..\include\SDL_thread.h"\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 NODEP_CPP_SDL_MI=\

@@ -20880,18 +20862,12 @@ DEP_CPP_SDL_MI=\
 	"..\..\include\SDL_thread.h"\

 	"..\..\include\SDL_timer.h"\

 	"..\..\include\SDL_types.h"\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 

 !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSIV) Release"

 

 DEP_CPP_SDL_MI=\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 NODEP_CPP_SDL_MI=\

@@ -20912,9 +20888,6 @@ NODEP_CPP_SDL_MI=\
 !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSIV) Debug"

 

 DEP_CPP_SDL_MI=\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 NODEP_CPP_SDL_MI=\

@@ -20935,9 +20908,6 @@ NODEP_CPP_SDL_MI=\
 !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE emulator) Release"

 

 DEP_CPP_SDL_MI=\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 NODEP_CPP_SDL_MI=\

@@ -20958,9 +20928,6 @@ NODEP_CPP_SDL_MI=\
 !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE emulator) Debug"

 

 DEP_CPP_SDL_MI=\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 NODEP_CPP_SDL_MI=\

@@ -20989,9 +20956,6 @@ NODEP_CPP_SDL_MI=\
 !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARMV4I) Release"

 

 DEP_CPP_SDL_MI=\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 NODEP_CPP_SDL_MI=\

@@ -21012,9 +20976,6 @@ NODEP_CPP_SDL_MI=\
 !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARMV4I) Debug"

 

 DEP_CPP_SDL_MI=\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 NODEP_CPP_SDL_MI=\

@@ -21035,9 +20996,6 @@ NODEP_CPP_SDL_MI=\
 !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSIV_FP) Release"

 

 DEP_CPP_SDL_MI=\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 NODEP_CPP_SDL_MI=\

@@ -21058,9 +21016,6 @@ NODEP_CPP_SDL_MI=\
 !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSIV_FP) Debug"

 

 DEP_CPP_SDL_MI=\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 NODEP_CPP_SDL_MI=\

@@ -21081,9 +21036,6 @@ NODEP_CPP_SDL_MI=\
 !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARMV4) Release"

 

 DEP_CPP_SDL_MI=\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 NODEP_CPP_SDL_MI=\

@@ -21112,9 +21064,6 @@ NODEP_CPP_SDL_MI=\
 !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARMV4) Debug"

 

 DEP_CPP_SDL_MI=\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 NODEP_CPP_SDL_MI=\

@@ -21145,9 +21094,6 @@ NODEP_CPP_SDL_MI=\
 DEP_CPP_SDL_MI=\

 	"..\..\include\SDL_cpuinfo.h"\

 	"..\..\include\SDL_thread.h"\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 NODEP_CPP_SDL_MI=\

@@ -21168,9 +21114,6 @@ NODEP_CPP_SDL_MI=\
 DEP_CPP_SDL_MI=\

 	"..\..\include\SDL_cpuinfo.h"\

 	"..\..\include\SDL_thread.h"\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 NODEP_CPP_SDL_MI=\

@@ -21189,9 +21132,6 @@ NODEP_CPP_SDL_MI=\
 !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARMV4T) Release"

 

 DEP_CPP_SDL_MI=\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 NODEP_CPP_SDL_MI=\

@@ -21212,9 +21152,6 @@ NODEP_CPP_SDL_MI=\
 !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARMV4T) Debug"

 

 DEP_CPP_SDL_MI=\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 NODEP_CPP_SDL_MI=\

@@ -21237,9 +21174,6 @@ NODEP_CPP_SDL_MI=\
 DEP_CPP_SDL_MI=\

 	"..\..\include\SDL_cpuinfo.h"\

 	"..\..\include\SDL_thread.h"\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 NODEP_CPP_SDL_MI=\

@@ -21277,9 +21211,6 @@ DEP_CPP_SDL_MI=\
 	"..\..\include\SDL_stdinc.h"\

 	"..\..\include\SDL_thread.h"\

 	"..\..\include\SDL_timer.h"\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 

@@ -21305,9 +21236,6 @@ DEP_CPP_SDL_MI=\
 	"..\..\include\SDL_stdinc.h"\

 	"..\..\include\SDL_thread.h"\

 	"..\..\include\SDL_timer.h"\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 

@@ -21333,9 +21261,6 @@ DEP_CPP_SDL_MI=\
 	"..\..\include\SDL_stdinc.h"\

 	"..\..\include\SDL_thread.h"\

 	"..\..\include\SDL_timer.h"\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 NODEP_CPP_SDL_MI=\

@@ -21347,9 +21272,6 @@ NODEP_CPP_SDL_MI=\
 DEP_CPP_SDL_MI=\

 	"..\..\include\SDL_cpuinfo.h"\

 	"..\..\include\SDL_thread.h"\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 NODEP_CPP_SDL_MI=\

@@ -21370,9 +21292,6 @@ NODEP_CPP_SDL_MI=\
 DEP_CPP_SDL_MI=\

 	"..\..\include\SDL_cpuinfo.h"\

 	"..\..\include\SDL_thread.h"\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 NODEP_CPP_SDL_MI=\

@@ -21403,9 +21322,6 @@ DEP_CPP_SDL_MI=\
 	"..\..\include\SDL_thread.h"\

 	"..\..\include\SDL_timer.h"\

 	"..\..\include\SDL_types.h"\

-	"..\..\src\audio\SDL_mixer_m68k.h"\

-	"..\..\src\audio\SDL_mixer_MMX.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

 	"..\..\src\audio\SDL_sysaudio.h"\

 	

 

@@ -21414,483 +21330,6 @@ DEP_CPP_SDL_MI=\
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\src\audio\SDL_mixer_MMX_VC.c

-

-!IF  "$(CFG)" == "SDL - Win32 (WCE MIPSII_FP) Release"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-NODEP_CPP_SDL_MIX=\

-	"..\include\SDL_config.h"\

-	"..\include\SDL_config_amiga.h"\

-	"..\include\SDL_config_dreamcast.h"\

-	"..\include\SDL_config_macos.h"\

-	"..\include\SDL_config_macosx.h"\

-	"..\include\SDL_config_os2.h"\

-	"..\include\SDL_config_win32.h"\

-	"..\include\SDL_config_wince.h"\

-	"..\include\SDL_platform.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSII_FP) Debug"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-NODEP_CPP_SDL_MIX=\

-	"..\include\SDL_config.h"\

-	"..\include\SDL_config_amiga.h"\

-	"..\include\SDL_config_dreamcast.h"\

-	"..\include\SDL_config_macos.h"\

-	"..\include\SDL_config_macosx.h"\

-	"..\include\SDL_config_os2.h"\

-	"..\include\SDL_config_win32.h"\

-	"..\include\SDL_config_wince.h"\

-	"..\include\SDL_platform.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSII) Release"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-NODEP_CPP_SDL_MIX=\

-	"..\include\SDL_config.h"\

-	"..\include\SDL_config_amiga.h"\

-	"..\include\SDL_config_dreamcast.h"\

-	"..\include\SDL_config_macos.h"\

-	"..\include\SDL_config_macosx.h"\

-	"..\include\SDL_config_os2.h"\

-	"..\include\SDL_config_win32.h"\

-	"..\include\SDL_config_wince.h"\

-	"..\include\SDL_platform.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSII) Debug"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-NODEP_CPP_SDL_MIX=\

-	"..\include\SDL_config.h"\

-	"..\include\SDL_config_amiga.h"\

-	"..\include\SDL_config_dreamcast.h"\

-	"..\include\SDL_config_macos.h"\

-	"..\include\SDL_config_macosx.h"\

-	"..\include\SDL_config_os2.h"\

-	"..\include\SDL_config_win32.h"\

-	"..\include\SDL_config_wince.h"\

-	"..\include\SDL_platform.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE SH4) Release"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\include\SDL_config.h"\

-	"..\..\include\SDL_config_amiga.h"\

-	"..\..\include\SDL_config_dreamcast.h"\

-	"..\..\include\SDL_config_macos.h"\

-	"..\..\include\SDL_config_macosx.h"\

-	"..\..\include\SDL_config_os2.h"\

-	"..\..\include\SDL_config_win32.h"\

-	"..\..\include\SDL_platform.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-NODEP_CPP_SDL_MIX=\

-	"..\include\SDL_config_wince.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE SH4) Debug"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\include\SDL_config.h"\

-	"..\..\include\SDL_config_amiga.h"\

-	"..\..\include\SDL_config_dreamcast.h"\

-	"..\..\include\SDL_config_macos.h"\

-	"..\..\include\SDL_config_macosx.h"\

-	"..\..\include\SDL_config_os2.h"\

-	"..\..\include\SDL_config_win32.h"\

-	"..\..\include\SDL_platform.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-NODEP_CPP_SDL_MIX=\

-	"..\include\SDL_config_wince.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE SH3) Debug"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\include\SDL_config.h"\

-	"..\..\include\SDL_config_amiga.h"\

-	"..\..\include\SDL_config_dreamcast.h"\

-	"..\..\include\SDL_config_macos.h"\

-	"..\..\include\SDL_config_macosx.h"\

-	"..\..\include\SDL_config_os2.h"\

-	"..\..\include\SDL_config_win32.h"\

-	"..\..\include\SDL_platform.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-NODEP_CPP_SDL_MIX=\

-	"..\include\SDL_config_wince.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSIV) Release"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-NODEP_CPP_SDL_MIX=\

-	"..\include\SDL_config.h"\

-	"..\include\SDL_config_amiga.h"\

-	"..\include\SDL_config_dreamcast.h"\

-	"..\include\SDL_config_macos.h"\

-	"..\include\SDL_config_macosx.h"\

-	"..\include\SDL_config_os2.h"\

-	"..\include\SDL_config_win32.h"\

-	"..\include\SDL_config_wince.h"\

-	"..\include\SDL_platform.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSIV) Debug"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-NODEP_CPP_SDL_MIX=\

-	"..\include\SDL_config.h"\

-	"..\include\SDL_config_amiga.h"\

-	"..\include\SDL_config_dreamcast.h"\

-	"..\include\SDL_config_macos.h"\

-	"..\include\SDL_config_macosx.h"\

-	"..\include\SDL_config_os2.h"\

-	"..\include\SDL_config_win32.h"\

-	"..\include\SDL_config_wince.h"\

-	"..\include\SDL_platform.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE emulator) Release"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-NODEP_CPP_SDL_MIX=\

-	"..\include\SDL_config.h"\

-	"..\include\SDL_config_amiga.h"\

-	"..\include\SDL_config_dreamcast.h"\

-	"..\include\SDL_config_macos.h"\

-	"..\include\SDL_config_macosx.h"\

-	"..\include\SDL_config_os2.h"\

-	"..\include\SDL_config_win32.h"\

-	"..\include\SDL_config_wince.h"\

-	"..\include\SDL_platform.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE emulator) Debug"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-NODEP_CPP_SDL_MIX=\

-	"..\include\SDL_config.h"\

-	"..\include\SDL_config_amiga.h"\

-	"..\include\SDL_config_dreamcast.h"\

-	"..\include\SDL_config_macos.h"\

-	"..\include\SDL_config_macosx.h"\

-	"..\include\SDL_config_os2.h"\

-	"..\include\SDL_config_win32.h"\

-	"..\include\SDL_config_wince.h"\

-	"..\include\SDL_platform.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARMV4I) Release"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-NODEP_CPP_SDL_MIX=\

-	"..\include\SDL_config.h"\

-	"..\include\SDL_config_amiga.h"\

-	"..\include\SDL_config_dreamcast.h"\

-	"..\include\SDL_config_macos.h"\

-	"..\include\SDL_config_macosx.h"\

-	"..\include\SDL_config_os2.h"\

-	"..\include\SDL_config_win32.h"\

-	"..\include\SDL_config_wince.h"\

-	"..\include\SDL_platform.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARMV4I) Debug"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-NODEP_CPP_SDL_MIX=\

-	"..\include\SDL_config.h"\

-	"..\include\SDL_config_amiga.h"\

-	"..\include\SDL_config_dreamcast.h"\

-	"..\include\SDL_config_macos.h"\

-	"..\include\SDL_config_macosx.h"\

-	"..\include\SDL_config_os2.h"\

-	"..\include\SDL_config_win32.h"\

-	"..\include\SDL_config_wince.h"\

-	"..\include\SDL_platform.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSIV_FP) Release"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-NODEP_CPP_SDL_MIX=\

-	"..\include\SDL_config.h"\

-	"..\include\SDL_config_amiga.h"\

-	"..\include\SDL_config_dreamcast.h"\

-	"..\include\SDL_config_macos.h"\

-	"..\include\SDL_config_macosx.h"\

-	"..\include\SDL_config_os2.h"\

-	"..\include\SDL_config_win32.h"\

-	"..\include\SDL_config_wince.h"\

-	"..\include\SDL_platform.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSIV_FP) Debug"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-NODEP_CPP_SDL_MIX=\

-	"..\include\SDL_config.h"\

-	"..\include\SDL_config_amiga.h"\

-	"..\include\SDL_config_dreamcast.h"\

-	"..\include\SDL_config_macos.h"\

-	"..\include\SDL_config_macosx.h"\

-	"..\include\SDL_config_os2.h"\

-	"..\include\SDL_config_win32.h"\

-	"..\include\SDL_config_wince.h"\

-	"..\include\SDL_platform.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARMV4) Release"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-NODEP_CPP_SDL_MIX=\

-	"..\include\SDL_config.h"\

-	"..\include\SDL_config_amiga.h"\

-	"..\include\SDL_config_dreamcast.h"\

-	"..\include\SDL_config_macos.h"\

-	"..\include\SDL_config_macosx.h"\

-	"..\include\SDL_config_os2.h"\

-	"..\include\SDL_config_win32.h"\

-	"..\include\SDL_config_wince.h"\

-	"..\include\SDL_platform.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARMV4) Debug"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-NODEP_CPP_SDL_MIX=\

-	"..\include\SDL_config.h"\

-	"..\include\SDL_config_amiga.h"\

-	"..\include\SDL_config_dreamcast.h"\

-	"..\include\SDL_config_macos.h"\

-	"..\include\SDL_config_macosx.h"\

-	"..\include\SDL_config_os2.h"\

-	"..\include\SDL_config_win32.h"\

-	"..\include\SDL_config_wince.h"\

-	"..\include\SDL_platform.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPS16) Release"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\include\SDL_config.h"\

-	"..\..\include\SDL_config_amiga.h"\

-	"..\..\include\SDL_config_dreamcast.h"\

-	"..\..\include\SDL_config_macos.h"\

-	"..\..\include\SDL_config_macosx.h"\

-	"..\..\include\SDL_config_os2.h"\

-	"..\..\include\SDL_config_win32.h"\

-	"..\..\include\SDL_platform.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-NODEP_CPP_SDL_MIX=\

-	"..\include\SDL_config_wince.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPS16) Debug"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\include\SDL_config.h"\

-	"..\..\include\SDL_config_amiga.h"\

-	"..\..\include\SDL_config_dreamcast.h"\

-	"..\..\include\SDL_config_macos.h"\

-	"..\..\include\SDL_config_macosx.h"\

-	"..\..\include\SDL_config_os2.h"\

-	"..\..\include\SDL_config_win32.h"\

-	"..\..\include\SDL_platform.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-NODEP_CPP_SDL_MIX=\

-	"..\include\SDL_config_wince.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARMV4T) Release"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-NODEP_CPP_SDL_MIX=\

-	"..\include\SDL_config.h"\

-	"..\include\SDL_config_amiga.h"\

-	"..\include\SDL_config_dreamcast.h"\

-	"..\include\SDL_config_macos.h"\

-	"..\include\SDL_config_macosx.h"\

-	"..\include\SDL_config_os2.h"\

-	"..\include\SDL_config_win32.h"\

-	"..\include\SDL_config_wince.h"\

-	"..\include\SDL_platform.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARMV4T) Debug"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-NODEP_CPP_SDL_MIX=\

-	"..\include\SDL_config.h"\

-	"..\include\SDL_config_amiga.h"\

-	"..\include\SDL_config_dreamcast.h"\

-	"..\include\SDL_config_macos.h"\

-	"..\include\SDL_config_macosx.h"\

-	"..\include\SDL_config_os2.h"\

-	"..\include\SDL_config_win32.h"\

-	"..\include\SDL_config_wince.h"\

-	"..\include\SDL_platform.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE x86) Release"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\include\SDL_config.h"\

-	"..\..\include\SDL_config_amiga.h"\

-	"..\..\include\SDL_config_dreamcast.h"\

-	"..\..\include\SDL_config_macos.h"\

-	"..\..\include\SDL_config_macosx.h"\

-	"..\..\include\SDL_config_os2.h"\

-	"..\..\include\SDL_config_win32.h"\

-	"..\..\include\SDL_platform.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-NODEP_CPP_SDL_MIX=\

-	"..\include\SDL_config_wince.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE x86) Debug"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\include\SDL_config.h"\

-	"..\..\include\SDL_config_amiga.h"\

-	"..\..\include\SDL_config_dreamcast.h"\

-	"..\..\include\SDL_config_macos.h"\

-	"..\..\include\SDL_config_macosx.h"\

-	"..\..\include\SDL_config_os2.h"\

-	"..\..\include\SDL_config_win32.h"\

-	"..\..\include\SDL_platform.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARM) Debug"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\include\SDL_config.h"\

-	"..\..\include\SDL_config_amiga.h"\

-	"..\..\include\SDL_config_dreamcast.h"\

-	"..\..\include\SDL_config_macos.h"\

-	"..\..\include\SDL_config_macosx.h"\

-	"..\..\include\SDL_config_os2.h"\

-	"..\..\include\SDL_config_win32.h"\

-	"..\..\include\SDL_platform.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARM) Release"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\include\SDL_config.h"\

-	"..\..\include\SDL_config_amiga.h"\

-	"..\..\include\SDL_config_dreamcast.h"\

-	"..\..\include\SDL_config_macos.h"\

-	"..\..\include\SDL_config_macosx.h"\

-	"..\..\include\SDL_config_os2.h"\

-	"..\..\include\SDL_config_win32.h"\

-	"..\..\include\SDL_platform.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-NODEP_CPP_SDL_MIX=\

-	"..\include\SDL_config_wince.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPS) Debug"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\include\SDL_config.h"\

-	"..\..\include\SDL_config_amiga.h"\

-	"..\..\include\SDL_config_dreamcast.h"\

-	"..\..\include\SDL_config_macos.h"\

-	"..\..\include\SDL_config_macosx.h"\

-	"..\..\include\SDL_config_os2.h"\

-	"..\..\include\SDL_config_win32.h"\

-	"..\..\include\SDL_platform.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-NODEP_CPP_SDL_MIX=\

-	"..\include\SDL_config_wince.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPS) Release"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\include\SDL_config.h"\

-	"..\..\include\SDL_config_amiga.h"\

-	"..\..\include\SDL_config_dreamcast.h"\

-	"..\..\include\SDL_config_macos.h"\

-	"..\..\include\SDL_config_macosx.h"\

-	"..\..\include\SDL_config_os2.h"\

-	"..\..\include\SDL_config_win32.h"\

-	"..\..\include\SDL_platform.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-NODEP_CPP_SDL_MIX=\

-	"..\include\SDL_config_wince.h"\

-	

-

-!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE SH3) Release"

-

-DEP_CPP_SDL_MIX=\

-	"..\..\include\SDL_config.h"\

-	"..\..\include\SDL_config_amiga.h"\

-	"..\..\include\SDL_config_dreamcast.h"\

-	"..\..\include\SDL_config_macos.h"\

-	"..\..\include\SDL_config_macosx.h"\

-	"..\..\include\SDL_config_os2.h"\

-	"..\..\include\SDL_config_win32.h"\

-	"..\..\include\SDL_platform.h"\

-	"..\..\src\audio\SDL_mixer_MMX_VC.h"\

-	

-NODEP_CPP_SDL_MIX=\

-	"..\include\SDL_config_wince.h"\

-	

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

 SOURCE=..\..\src\events\SDL_mouse.c

 

 !IF  "$(CFG)" == "SDL - Win32 (WCE MIPSII_FP) Release"

@@ -41883,18 +41322,6 @@ SOURCE=..\..\src\video\SDL_memops.h
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\src\audio\SDL_mixer_m68k.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\src\audio\SDL_mixer_MMX.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\src\audio\SDL_mixer_MMX_VC.h

-# End Source File

-# Begin Source File

-

 SOURCE=..\..\include\SDL_mouse.h

 # End Source File

 # Begin Source File

diff --git a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj
index 3baca156..b506b170 100755
--- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj
+++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj
@@ -171,9 +171,6 @@
 		FD6526680DE8FCDD002AD96B /* SDL_audiocvt.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B9460DD52EDC00FB1D6B /* SDL_audiocvt.c */; };
 		FD65266A0DE8FCDD002AD96B /* SDL_audiotypecvt.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B94A0DD52EDC00FB1D6B /* SDL_audiotypecvt.c */; };
 		FD65266B0DE8FCDD002AD96B /* SDL_mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B94B0DD52EDC00FB1D6B /* SDL_mixer.c */; };
-		FD65266C0DE8FCDD002AD96B /* SDL_mixer_m68k.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B94C0DD52EDC00FB1D6B /* SDL_mixer_m68k.c */; };
-		FD65266D0DE8FCDD002AD96B /* SDL_mixer_MMX.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B94E0DD52EDC00FB1D6B /* SDL_mixer_MMX.c */; };
-		FD65266E0DE8FCDD002AD96B /* SDL_mixer_MMX_VC.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B9500DD52EDC00FB1D6B /* SDL_mixer_MMX_VC.c */; };
 		FD65266F0DE8FCDD002AD96B /* SDL_wave.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B9530DD52EDC00FB1D6B /* SDL_wave.c */; };
 		FD6526700DE8FCDD002AD96B /* SDL_cpuinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B98B0DD52EDC00FB1D6B /* SDL_cpuinfo.c */; };
 		FD6526710DE8FCDD002AD96B /* SDL_events.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B9930DD52EDC00FB1D6B /* SDL_events.c */; };
@@ -453,12 +450,6 @@
 		FD99B9490DD52EDC00FB1D6B /* SDL_audiomem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_audiomem.h; sourceTree = "<group>"; };
 		FD99B94A0DD52EDC00FB1D6B /* SDL_audiotypecvt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_audiotypecvt.c; sourceTree = "<group>"; };
 		FD99B94B0DD52EDC00FB1D6B /* SDL_mixer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_mixer.c; sourceTree = "<group>"; };
-		FD99B94C0DD52EDC00FB1D6B /* SDL_mixer_m68k.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_mixer_m68k.c; sourceTree = "<group>"; };
-		FD99B94D0DD52EDC00FB1D6B /* SDL_mixer_m68k.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_mixer_m68k.h; sourceTree = "<group>"; };
-		FD99B94E0DD52EDC00FB1D6B /* SDL_mixer_MMX.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_mixer_MMX.c; sourceTree = "<group>"; };
-		FD99B94F0DD52EDC00FB1D6B /* SDL_mixer_MMX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_mixer_MMX.h; sourceTree = "<group>"; };
-		FD99B9500DD52EDC00FB1D6B /* SDL_mixer_MMX_VC.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_mixer_MMX_VC.c; sourceTree = "<group>"; };
-		FD99B9510DD52EDC00FB1D6B /* SDL_mixer_MMX_VC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_mixer_MMX_VC.h; sourceTree = "<group>"; };
 		FD99B9520DD52EDC00FB1D6B /* SDL_sysaudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysaudio.h; sourceTree = "<group>"; };
 		FD99B9530DD52EDC00FB1D6B /* SDL_wave.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_wave.c; sourceTree = "<group>"; };
 		FD99B9540DD52EDC00FB1D6B /* SDL_wave.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_wave.h; sourceTree = "<group>"; };
@@ -997,12 +988,6 @@
 				FD99B9490DD52EDC00FB1D6B /* SDL_audiomem.h */,
 				FD99B94A0DD52EDC00FB1D6B /* SDL_audiotypecvt.c */,
 				FD99B94B0DD52EDC00FB1D6B /* SDL_mixer.c */,
-				FD99B94C0DD52EDC00FB1D6B /* SDL_mixer_m68k.c */,
-				FD99B94D0DD52EDC00FB1D6B /* SDL_mixer_m68k.h */,
-				FD99B94E0DD52EDC00FB1D6B /* SDL_mixer_MMX.c */,
-				FD99B94F0DD52EDC00FB1D6B /* SDL_mixer_MMX.h */,
-				FD99B9500DD52EDC00FB1D6B /* SDL_mixer_MMX_VC.c */,
-				FD99B9510DD52EDC00FB1D6B /* SDL_mixer_MMX_VC.h */,
 				FD99B9520DD52EDC00FB1D6B /* SDL_sysaudio.h */,
 				FD99B9530DD52EDC00FB1D6B /* SDL_wave.c */,
 				FD99B9540DD52EDC00FB1D6B /* SDL_wave.h */,
@@ -1404,9 +1389,6 @@
 				FD6526680DE8FCDD002AD96B /* SDL_audiocvt.c in Sources */,
 				FD65266A0DE8FCDD002AD96B /* SDL_audiotypecvt.c in Sources */,
 				FD65266B0DE8FCDD002AD96B /* SDL_mixer.c in Sources */,
-				FD65266C0DE8FCDD002AD96B /* SDL_mixer_m68k.c in Sources */,
-				FD65266D0DE8FCDD002AD96B /* SDL_mixer_MMX.c in Sources */,
-				FD65266E0DE8FCDD002AD96B /* SDL_mixer_MMX_VC.c in Sources */,
 				FD65266F0DE8FCDD002AD96B /* SDL_wave.c in Sources */,
 				FD6526700DE8FCDD002AD96B /* SDL_cpuinfo.c in Sources */,
 				FD6526710DE8FCDD002AD96B /* SDL_events.c in Sources */,
diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
index f40c46c9..5595ba1a 100755
--- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj
+++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
@@ -166,12 +166,6 @@
 		04BD002B12E6671800899322 /* SDL_audiomem.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB912E6671700899322 /* SDL_audiomem.h */; };
 		04BD002C12E6671800899322 /* SDL_audiotypecvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBA12E6671700899322 /* SDL_audiotypecvt.c */; };
 		04BD002D12E6671800899322 /* SDL_mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBB12E6671700899322 /* SDL_mixer.c */; };
-		04BD002E12E6671800899322 /* SDL_mixer_m68k.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBC12E6671700899322 /* SDL_mixer_m68k.c */; };
-		04BD002F12E6671800899322 /* SDL_mixer_m68k.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDBD12E6671700899322 /* SDL_mixer_m68k.h */; };
-		04BD003012E6671800899322 /* SDL_mixer_MMX.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBE12E6671700899322 /* SDL_mixer_MMX.c */; };
-		04BD003112E6671800899322 /* SDL_mixer_MMX.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDBF12E6671700899322 /* SDL_mixer_MMX.h */; };
-		04BD003212E6671800899322 /* SDL_mixer_MMX_VC.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDC012E6671700899322 /* SDL_mixer_MMX_VC.c */; };
-		04BD003312E6671800899322 /* SDL_mixer_MMX_VC.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDC112E6671700899322 /* SDL_mixer_MMX_VC.h */; };
 		04BD003412E6671800899322 /* SDL_sysaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDC212E6671700899322 /* SDL_sysaudio.h */; };
 		04BD003512E6671800899322 /* SDL_wave.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDC312E6671700899322 /* SDL_wave.c */; };
 		04BD003612E6671800899322 /* SDL_wave.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDC412E6671700899322 /* SDL_wave.h */; };
@@ -330,12 +324,6 @@
 		04BD024712E6671800899322 /* SDL_audiomem.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB912E6671700899322 /* SDL_audiomem.h */; };
 		04BD024812E6671800899322 /* SDL_audiotypecvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBA12E6671700899322 /* SDL_audiotypecvt.c */; };
 		04BD024912E6671800899322 /* SDL_mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBB12E6671700899322 /* SDL_mixer.c */; };
-		04BD024A12E6671800899322 /* SDL_mixer_m68k.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBC12E6671700899322 /* SDL_mixer_m68k.c */; };
-		04BD024B12E6671800899322 /* SDL_mixer_m68k.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDBD12E6671700899322 /* SDL_mixer_m68k.h */; };
-		04BD024C12E6671800899322 /* SDL_mixer_MMX.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBE12E6671700899322 /* SDL_mixer_MMX.c */; };
-		04BD024D12E6671800899322 /* SDL_mixer_MMX.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDBF12E6671700899322 /* SDL_mixer_MMX.h */; };
-		04BD024E12E6671800899322 /* SDL_mixer_MMX_VC.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDC012E6671700899322 /* SDL_mixer_MMX_VC.c */; };
-		04BD024F12E6671800899322 /* SDL_mixer_MMX_VC.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDC112E6671700899322 /* SDL_mixer_MMX_VC.h */; };
 		04BD025012E6671800899322 /* SDL_sysaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDC212E6671700899322 /* SDL_sysaudio.h */; };
 		04BD025112E6671800899322 /* SDL_wave.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDC312E6671700899322 /* SDL_wave.c */; };
 		04BD025212E6671800899322 /* SDL_wave.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDC412E6671700899322 /* SDL_wave.h */; };
@@ -666,12 +654,6 @@
 		04BDFDB912E6671700899322 /* SDL_audiomem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_audiomem.h; sourceTree = "<group>"; };
 		04BDFDBA12E6671700899322 /* SDL_audiotypecvt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_audiotypecvt.c; sourceTree = "<group>"; };
 		04BDFDBB12E6671700899322 /* SDL_mixer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_mixer.c; sourceTree = "<group>"; };
-		04BDFDBC12E6671700899322 /* SDL_mixer_m68k.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_mixer_m68k.c; sourceTree = "<group>"; };
-		04BDFDBD12E6671700899322 /* SDL_mixer_m68k.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_mixer_m68k.h; sourceTree = "<group>"; };
-		04BDFDBE12E6671700899322 /* SDL_mixer_MMX.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_mixer_MMX.c; sourceTree = "<group>"; };
-		04BDFDBF12E6671700899322 /* SDL_mixer_MMX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_mixer_MMX.h; sourceTree = "<group>"; };
-		04BDFDC012E6671700899322 /* SDL_mixer_MMX_VC.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_mixer_MMX_VC.c; sourceTree = "<group>"; };
-		04BDFDC112E6671700899322 /* SDL_mixer_MMX_VC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_mixer_MMX_VC.h; sourceTree = "<group>"; };
 		04BDFDC212E6671700899322 /* SDL_sysaudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysaudio.h; sourceTree = "<group>"; };
 		04BDFDC312E6671700899322 /* SDL_wave.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_wave.c; sourceTree = "<group>"; };
 		04BDFDC412E6671700899322 /* SDL_wave.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_wave.h; sourceTree = "<group>"; };
@@ -1166,12 +1148,6 @@
 				04BDFDB912E6671700899322 /* SDL_audiomem.h */,
 				04BDFDBA12E6671700899322 /* SDL_audiotypecvt.c */,
 				04BDFDBB12E6671700899322 /* SDL_mixer.c */,
-				04BDFDBC12E6671700899322 /* SDL_mixer_m68k.c */,
-				04BDFDBD12E6671700899322 /* SDL_mixer_m68k.h */,
-				04BDFDBE12E6671700899322 /* SDL_mixer_MMX.c */,
-				04BDFDBF12E6671700899322 /* SDL_mixer_MMX.h */,
-				04BDFDC012E6671700899322 /* SDL_mixer_MMX_VC.c */,
-				04BDFDC112E6671700899322 /* SDL_mixer_MMX_VC.h */,
 				04BDFDC212E6671700899322 /* SDL_sysaudio.h */,
 				04BDFDC312E6671700899322 /* SDL_wave.c */,
 				04BDFDC412E6671700899322 /* SDL_wave.h */,
@@ -1681,9 +1657,6 @@
 				04BD002712E6671800899322 /* SDL_audio_c.h in Headers */,
 				04BD002A12E6671800899322 /* SDL_audiodev_c.h in Headers */,
 				04BD002B12E6671800899322 /* SDL_audiomem.h in Headers */,
-				04BD002F12E6671800899322 /* SDL_mixer_m68k.h in Headers */,
-				04BD003112E6671800899322 /* SDL_mixer_MMX.h in Headers */,
-				04BD003312E6671800899322 /* SDL_mixer_MMX_VC.h in Headers */,
 				04BD003412E6671800899322 /* SDL_sysaudio.h in Headers */,
 				04BD003612E6671800899322 /* SDL_wave.h in Headers */,
 				04BD004212E6671800899322 /* blank_cursor.h in Headers */,
@@ -1796,9 +1769,6 @@
 				04BD024312E6671800899322 /* SDL_audio_c.h in Headers */,
 				04BD024612E6671800899322 /* SDL_audiodev_c.h in Headers */,
 				04BD024712E6671800899322 /* SDL_audiomem.h in Headers */,
-				04BD024B12E6671800899322 /* SDL_mixer_m68k.h in Headers */,
-				04BD024D12E6671800899322 /* SDL_mixer_MMX.h in Headers */,
-				04BD024F12E6671800899322 /* SDL_mixer_MMX_VC.h in Headers */,
 				04BD025012E6671800899322 /* SDL_sysaudio.h in Headers */,
 				04BD025212E6671800899322 /* SDL_wave.h in Headers */,
 				04BD025D12E6671800899322 /* blank_cursor.h in Headers */,
@@ -2111,9 +2081,6 @@
 				04BD002912E6671800899322 /* SDL_audiodev.c in Sources */,
 				04BD002C12E6671800899322 /* SDL_audiotypecvt.c in Sources */,
 				04BD002D12E6671800899322 /* SDL_mixer.c in Sources */,
-				04BD002E12E6671800899322 /* SDL_mixer_m68k.c in Sources */,
-				04BD003012E6671800899322 /* SDL_mixer_MMX.c in Sources */,
-				04BD003212E6671800899322 /* SDL_mixer_MMX_VC.c in Sources */,
 				04BD003512E6671800899322 /* SDL_wave.c in Sources */,
 				04BD004112E6671800899322 /* SDL_cpuinfo.c in Sources */,
 				04BD004812E6671800899322 /* SDL_clipboardevents.c in Sources */,
@@ -2226,9 +2193,6 @@
 				04BD024512E6671800899322 /* SDL_audiodev.c in Sources */,
 				04BD024812E6671800899322 /* SDL_audiotypecvt.c in Sources */,
 				04BD024912E6671800899322 /* SDL_mixer.c in Sources */,
-				04BD024A12E6671800899322 /* SDL_mixer_m68k.c in Sources */,
-				04BD024C12E6671800899322 /* SDL_mixer_MMX.c in Sources */,
-				04BD024E12E6671800899322 /* SDL_mixer_MMX_VC.c in Sources */,
 				04BD025112E6671800899322 /* SDL_wave.c in Sources */,
 				04BD025C12E6671800899322 /* SDL_cpuinfo.c in Sources */,
 				04BD026312E6671800899322 /* SDL_clipboardevents.c in Sources */,
diff --git a/src/audio/SDL_mixer.c b/src/audio/SDL_mixer.c
index e325b575..5b122bf9 100644
--- a/src/audio/SDL_mixer.c
+++ b/src/audio/SDL_mixer.c
@@ -26,9 +26,6 @@
 #include "SDL_timer.h"
 #include "SDL_audio.h"
 #include "SDL_sysaudio.h"
-#include "SDL_mixer_MMX.h"
-#include "SDL_mixer_MMX_VC.h"
-#include "SDL_mixer_m68k.h"
 
 /* This table is used to add two sound values together and pin
  * the value to avoid overflow.  (used with permission from ARDI)
@@ -121,95 +118,55 @@ SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format,
 
     case AUDIO_S8:
         {
-#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */
-#if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
-            if (SDL_HasMMX()) {
-                SDL_MixAudio_MMX_S8((char *) dst, (char *) src,
-                                    (unsigned int) len, (int) volume);
-            } else
-#elif ((defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)) && defined(SDL_ASSEMBLY_ROUTINES)
-            if (SDL_HasMMX()) {
-                SDL_MixAudio_MMX_S8_VC((char *) dst, (char *) src,
-                                       (unsigned int) len, (int) volume);
-            } else
-#endif
-#endif
-#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
-                SDL_MixAudio_m68k_S8((char *) dst, (char *) src,
-                                     (unsigned long) len, (long) volume);
-#else
-            {
-                Sint8 *dst8, *src8;
-                Sint8 src_sample;
-                int dst_sample;
-                const int max_audioval = ((1 << (8 - 1)) - 1);
-                const int min_audioval = -(1 << (8 - 1));
+            Sint8 *dst8, *src8;
+            Sint8 src_sample;
+            int dst_sample;
+            const int max_audioval = ((1 << (8 - 1)) - 1);
+            const int min_audioval = -(1 << (8 - 1));
 
-                src8 = (Sint8 *) src;
-                dst8 = (Sint8 *) dst;
-                while (len--) {
-                    src_sample = *src8;
-                    ADJUST_VOLUME(src_sample, volume);
-                    dst_sample = *dst8 + src_sample;
-                    if (dst_sample > max_audioval) {
-                        *dst8 = max_audioval;
-                    } else if (dst_sample < min_audioval) {
-                        *dst8 = min_audioval;
-                    } else {
-                        *dst8 = dst_sample;
-                    }
-                    ++dst8;
-                    ++src8;
+            src8 = (Sint8 *) src;
+            dst8 = (Sint8 *) dst;
+            while (len--) {
+                src_sample = *src8;
+                ADJUST_VOLUME(src_sample, volume);
+                dst_sample = *dst8 + src_sample;
+                if (dst_sample > max_audioval) {
+                    *dst8 = max_audioval;
+                } else if (dst_sample < min_audioval) {
+                    *dst8 = min_audioval;
+                } else {
+                    *dst8 = dst_sample;
                 }
+                ++dst8;
+                ++src8;
             }
-#endif
         }
         break;
 
     case AUDIO_S16LSB:
         {
-#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */
-#if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
-            if (SDL_HasMMX()) {
-                SDL_MixAudio_MMX_S16((char *) dst, (char *) src,
-                                     (unsigned int) len, (int) volume);
-            } else
-#elif ((defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)) && defined(SDL_ASSEMBLY_ROUTINES)
-            if (SDL_HasMMX()) {
-                SDL_MixAudio_MMX_S16_VC((char *) dst, (char *) src,
-                                        (unsigned int) len, (int) volume);
-            } else
-#endif
-#endif
-#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
-                SDL_MixAudio_m68k_S16LSB((short *) dst, (short *) src,
-                                         (unsigned long) len, (long) volume);
-#else
-            {
-                Sint16 src1, src2;
-                int dst_sample;
-                const int max_audioval = ((1 << (16 - 1)) - 1);
-                const int min_audioval = -(1 << (16 - 1));
+            Sint16 src1, src2;
+            int dst_sample;
+            const int max_audioval = ((1 << (16 - 1)) - 1);
+            const int min_audioval = -(1 << (16 - 1));
 
-                len /= 2;
-                while (len--) {
-                    src1 = ((src[1]) << 8 | src[0]);
-                    ADJUST_VOLUME(src1, volume);
-                    src2 = ((dst[1]) << 8 | dst[0]);
-                    src += 2;
-                    dst_sample = src1 + src2;
-                    if (dst_sample > max_audioval) {
-                        dst_sample = max_audioval;
-                    } else if (dst_sample < min_audioval) {
-                        dst_sample = min_audioval;
-                    }
-                    dst[0] = dst_sample & 0xFF;
-                    dst_sample >>= 8;
-                    dst[1] = dst_sample & 0xFF;
-                    dst += 2;
+            len /= 2;
+            while (len--) {
+                src1 = ((src[1]) << 8 | src[0]);
+                ADJUST_VOLUME(src1, volume);
+                src2 = ((dst[1]) << 8 | dst[0]);
+                src += 2;
+                dst_sample = src1 + src2;
+                if (dst_sample > max_audioval) {
+                    dst_sample = max_audioval;
+                } else if (dst_sample < min_audioval) {
+                    dst_sample = min_audioval;
                 }
+                dst[0] = dst_sample & 0xFF;
+                dst_sample >>= 8;
+                dst[1] = dst_sample & 0xFF;
+                dst += 2;
             }
-#endif
         }
         break;
 
diff --git a/src/audio/SDL_mixer_MMX.c b/src/audio/SDL_mixer_MMX.c
deleted file mode 100644
index a7e3789a..00000000
--- a/src/audio/SDL_mixer_MMX.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2011 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/*
-    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)
-    This code is licensed under the LGPL (see COPYING for details)
- 
-    Assumes buffer size in bytes is a multiple of 16
-    Assumes SDL_MIX_MAXVOLUME = 128
-*/
-
-
-/***********************************************
-*   Mixing for 16 bit signed buffers
-***********************************************/
-
-#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */
-#if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
-void
-SDL_MixAudio_MMX_S16(char *dst, char *src, unsigned int size, int volume)
-{
-    __asm__ __volatile__("	movl %3,%%eax\n"        /* eax = volume */
-                         "	movl %2,%%edx\n"        /* edx = size */
-                         "	shrl $4,%%edx\n"        /* process 16 bytes per iteration = 8 samples */
-                         "	jz .endS16\n" "	pxor %%mm0,%%mm0\n" "	movd %%eax,%%mm0\n" "	movq %%mm0,%%mm1\n" "	psllq $16,%%mm0\n" "	por %%mm1,%%mm0\n" "	psllq $16,%%mm0\n" "	por %%mm1,%%mm0\n" "	psllq $16,%%mm0\n" "	por %%mm1,%%mm0\n"      /* mm0 = vol|vol|vol|vol */
-                         ".align 8\n" "	.mixloopS16:\n" "	movq (%1),%%mm1\n"      /* mm1 = a|b|c|d */
-                         "	movq %%mm1,%%mm2\n"     /* mm2 = a|b|c|d */
-                         "	movq 8(%1),%%mm4\n"     /* mm4 = e|f|g|h */
-                         /* pré charger le buffer dst dans mm7 */
-                         "	movq (%0),%%mm7\n"      /* mm7 = dst[0] */
-                         /* multiplier par le volume */
-                         "	pmullw %%mm0,%%mm1\n"   /* mm1 = l(a*v)|l(b*v)|l(c*v)|l(d*v) */
-                         "	pmulhw %%mm0,%%mm2\n"   /* mm2 = h(a*v)|h(b*v)|h(c*v)|h(d*v) */
-                         "	movq %%mm4,%%mm5\n"     /* mm5 = e|f|g|h */
-                         "	pmullw %%mm0,%%mm4\n"   /* mm4 = l(e*v)|l(f*v)|l(g*v)|l(h*v) */
-                         "	pmulhw %%mm0,%%mm5\n"   /* mm5 = h(e*v)|h(f*v)|h(g*v)|h(h*v) */
-                         "	movq %%mm1,%%mm3\n"     /* mm3 = l(a*v)|l(b*v)|l(c*v)|l(d*v) */
-                         "	punpckhwd %%mm2,%%mm1\n"        /* mm1 = a*v|b*v */
-                         "	movq %%mm4,%%mm6\n"     /* mm6 = l(e*v)|l(f*v)|l(g*v)|l(h*v) */
-                         "	punpcklwd %%mm2,%%mm3\n"        /* mm3 = c*v|d*v */
-                         "	punpckhwd %%mm5,%%mm4\n"        /* mm4 = e*f|f*v */
-                         "	punpcklwd %%mm5,%%mm6\n"        /* mm6 = g*v|h*v */
-                         /* pré charger le buffer dst dans mm5 */
-                         "	movq 8(%0),%%mm5\n"     /* mm5 = dst[1] */
-                         /* diviser par 128 */
-                         "	psrad $7,%%mm1\n"       /* mm1 = a*v/128|b*v/128 , 128 = SDL_MIX_MAXVOLUME */
-                         "	add $16,%1\n" "	psrad $7,%%mm3\n"       /* mm3 = c*v/128|d*v/128 */
-                         "	psrad $7,%%mm4\n"       /* mm4 = e*v/128|f*v/128 */
-                         /* mm1 = le sample avec le volume modifié */
-                         "	packssdw %%mm1,%%mm3\n" /* mm3 = s(a*v|b*v|c*v|d*v) */
-                         "	psrad $7,%%mm6\n"       /* mm6= g*v/128|h*v/128 */
-                         "	paddsw %%mm7,%%mm3\n"   /* mm3 = adjust_volume(src)+dst */
-                         /* mm4 = le sample avec le volume modifié */
-                         "	packssdw %%mm4,%%mm6\n" /* mm6 = s(e*v|f*v|g*v|h*v) */
-                         "	movq %%mm3,(%0)\n" "	paddsw %%mm5,%%mm6\n"   /* mm6 = adjust_volume(src)+dst */
-                         "	movq %%mm6,8(%0)\n"
-                         "	add $16,%0\n"
-                         "	dec %%edx\n"
-                         "	jnz .mixloopS16\n"
-                         "	emms\n"
-                         ".endS16:\n"::"r"(dst), "r"(src),
-                         "m"(size), "m"(volume):"eax", "edx", "memory");
-}
-
-
-
-/*////////////////////////////////////////////// */
-/* Mixing for 8 bit signed buffers */
-/*////////////////////////////////////////////// */
-
-void
-SDL_MixAudio_MMX_S8(char *dst, char *src, unsigned int size, int volume)
-{
-    __asm__ __volatile__("	movl %3,%%eax\n"        /* eax = volume */
-                         "	movd %%eax,%%mm0\n" "	movq %%mm0,%%mm1\n" "	psllq $16,%%mm0\n" "	por %%mm1,%%mm0\n" "	psllq $16,%%mm0\n" "	por %%mm1,%%mm0\n" "	psllq $16,%%mm0\n" "	por %%mm1,%%mm0\n" "	movl %2,%%edx\n"        /* edx = size */
-                         "	shr $3,%%edx\n" /* process 8 bytes per iteration = 8 samples */
-                         "	cmp $0,%%edx\n" "	je .endS8\n" ".align 8\n" "	.mixloopS8:\n" "	pxor %%mm2,%%mm2\n"     /* mm2 = 0 */
-                         "	movq (%1),%%mm1\n"      /* mm1 = a|b|c|d|e|f|g|h */
-                         "	movq %%mm1,%%mm3\n"     /* mm3 = a|b|c|d|e|f|g|h */
-                         /* on va faire le "sign extension" en faisant un cmp avec 0 qui retourne 1 si <0, 0 si >0 */
-                         "	pcmpgtb %%mm1,%%mm2\n"  /* mm2 = 11111111|00000000|00000000.... */
-                         "	punpckhbw %%mm2,%%mm1\n"        /* mm1 = 0|a|0|b|0|c|0|d */
-                         "	punpcklbw %%mm2,%%mm3\n"        /* mm3 = 0|e|0|f|0|g|0|h */
-                         "	movq (%0),%%mm2\n"      /* mm2 = destination */
-                         "	pmullw %%mm0,%%mm1\n"   /* mm1 = v*a|v*b|v*c|v*d */
-                         "	add $8,%1\n" "	pmullw %%mm0,%%mm3\n"   /* mm3 = v*e|v*f|v*g|v*h */
-                         "	psraw $7,%%mm1\n"       /* mm1 = v*a/128|v*b/128|v*c/128|v*d/128  */
-                         "	psraw $7,%%mm3\n"       /* mm3 = v*e/128|v*f/128|v*g/128|v*h/128 */
-                         "	packsswb %%mm1,%%mm3\n" /* mm1 = v*a/128|v*b/128|v*c/128|v*d/128|v*e/128|v*f/128|v*g/128|v*h/128 */
-                         "	paddsb %%mm2,%%mm3\n"   /* add to destination buffer */
-                         "	movq %%mm3,(%0)\n"      /* store back to ram */
-                         "	add $8,%0\n"
-                         "	dec %%edx\n"
-                         "	jnz .mixloopS8\n"
-                         ".endS8:\n"
-                         "	emms\n"::"r"(dst), "r"(src), "m"(size),
-                         "m"(volume):"eax", "edx", "memory");
-}
-#endif
-
-#endif /* SDL_BUGGY_MMX_MIXERS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/SDL_mixer_MMX.h b/src/audio/SDL_mixer_MMX.h
deleted file mode 100644
index c45b5731..00000000
--- a/src/audio/SDL_mixer_MMX.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-    headers for MMX assembler version of SDL_MixAudio
-    Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr)
-    This code is licensed under the LGPL (see COPYING for details)
-
-    Assumes buffer size in bytes is a multiple of 16
-    Assumes SDL_MIX_MAXVOLUME = 128
-*/
-#include "SDL_config.h"
-
-#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */
-#if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
-void SDL_MixAudio_MMX_S16(char *, char *, unsigned int, int);
-void SDL_MixAudio_MMX_S8(char *, char *, unsigned int, int);
-#endif
-#endif /* SDL_BUGGY_MMX_MIXERS */
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/SDL_mixer_MMX_VC.c b/src/audio/SDL_mixer_MMX_VC.c
deleted file mode 100644
index 75dac46d..00000000
--- a/src/audio/SDL_mixer_MMX_VC.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2011 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-#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)
-// Converted to Intel ASM notation by Cth
-// This code is licensed under the LGPL (see COPYING for details)
-// 
-// Assumes buffer size in bytes is a multiple of 16
-// Assumes SDL_MIX_MAXVOLUME = 128
-
-
-////////////////////////////////////////////////
-// Mixing for 16 bit signed buffers
-////////////////////////////////////////////////
-
-void
-SDL_MixAudio_MMX_S16_VC(char *dst, char *src, unsigned int nSize, int volume)
-{
-    /* *INDENT-OFF* */
-	__asm
-	{
-
-		push	edi
-		push	esi
-		push	ebx
-		
-		mov		edi, dst		// edi = dst
-		mov		esi, src		// esi = src
-		mov		eax, volume		// eax = volume
-		mov		ebx, nSize		// ebx = size
-		shr		ebx, 4			// process 16 bytes per iteration = 8 samples
-		jz		endS16
-		
-		pxor	mm0, mm0
-		movd	mm0, eax		//%%eax,%%mm0
-		movq	mm1, mm0		//%%mm0,%%mm1
-		psllq	mm0, 16			//$16,%%mm0
-		por		mm0, mm1		//%%mm1,%%mm0
-		psllq	mm0, 16			//$16,%%mm0
-		por		mm0, mm1		//%%mm1,%%mm0
-		psllq	mm0, 16			//$16,%%mm0
-		por		mm0, mm1		//%%mm1,%%mm0			// mm0 = vol|vol|vol|vol
-
-		#ifndef __WATCOMC__
-		align	16
-		#endif
-mixloopS16:
-		movq	mm1, [esi]		//(%%esi),%%mm1\n" // mm1 = a|b|c|d
-		movq	mm2, mm1		//%%mm1,%%mm2\n" // mm2 = a|b|c|d
-		movq	mm4, [esi + 8]	//8(%%esi),%%mm4\n" // mm4 = e|f|g|h
-		// pre charger le buffer dst dans mm7
-		movq	mm7, [edi]		//(%%edi),%%mm7\n" // mm7 = dst[0]"
-		// multiplier par le volume
-		pmullw	mm1, mm0		//%%mm0,%%mm1\n" // mm1 = l(a*v)|l(b*v)|l(c*v)|l(d*v)
-		pmulhw	mm2, mm0		//%%mm0,%%mm2\n" // mm2 = h(a*v)|h(b*v)|h(c*v)|h(d*v)
-		movq	mm5, mm4		//%%mm4,%%mm5\n" // mm5 = e|f|g|h
-		pmullw	mm4, mm0		//%%mm0,%%mm4\n" // mm4 = l(e*v)|l(f*v)|l(g*v)|l(h*v)
-		pmulhw	mm5, mm0		//%%mm0,%%mm5\n" // mm5 = h(e*v)|h(f*v)|h(g*v)|h(h*v)
-		movq	mm3, mm1		//%%mm1,%%mm3\n" // mm3 = l(a*v)|l(b*v)|l(c*v)|l(d*v)
-		punpckhwd	mm1, mm2	//%%mm2,%%mm1\n" // mm1 = a*v|b*v
-		movq		mm6, mm4	//%%mm4,%%mm6\n" // mm6 = l(e*v)|l(f*v)|l(g*v)|l(h*v)
-		punpcklwd	mm3, mm2	//%%mm2,%%mm3\n" // mm3 = c*v|d*v
-		punpckhwd	mm4, mm5	//%%mm5,%%mm4\n" // mm4 = e*f|f*v
-		punpcklwd	mm6, mm5	//%%mm5,%%mm6\n" // mm6 = g*v|h*v
-		// pre charger le buffer dst dans mm5
-		movq	mm5, [edi + 8]	//8(%%edi),%%mm5\n" // mm5 = dst[1]
-		// diviser par 128
-		psrad	mm1, 7			//$7,%%mm1\n" // mm1 = a*v/128|b*v/128 , 128 = SDL_MIX_MAXVOLUME
-		add		esi, 16			//$16,%%esi\n"
-		psrad	mm3, 7			//$7,%%mm3\n" // mm3 = c*v/128|d*v/128
-		psrad	mm4, 7			//$7,%%mm4\n" // mm4 = e*v/128|f*v/128
-		// mm1 = le sample avec le volume modifie
-		packssdw	mm3, mm1	//%%mm1,%%mm3\n" // mm3 = s(a*v|b*v|c*v|d*v)
-		psrad	mm6, 7			//$7,%%mm6\n" // mm6= g*v/128|h*v/128
-		paddsw	mm3, mm7		//%%mm7,%%mm3\n" // mm3 = adjust_volume(src)+dst
-		// mm4 = le sample avec le volume modifie
-		packssdw	mm6, mm4	//%%mm4,%%mm6\n" // mm6 = s(e*v|f*v|g*v|h*v)
-		movq	[edi], mm3		//%%mm3,(%%edi)\n"
-		paddsw	mm6, mm5		//%%mm5,%%mm6\n" // mm6 = adjust_volume(src)+dst
-		movq	[edi + 8], mm6	//%%mm6,8(%%edi)\n"
-		add		edi, 16			//$16,%%edi\n"
-		dec		ebx				//%%ebx\n"
-		jnz mixloopS16
-
-endS16:
-		emms
-		
-		pop		ebx
-		pop		esi
-		pop		edi
-	}
-    /* *INDENT-ON* */
-}
-
-////////////////////////////////////////////////
-// Mixing for 8 bit signed buffers
-////////////////////////////////////////////////
-
-void
-SDL_MixAudio_MMX_S8_VC(char *dst, char *src, unsigned int nSize, int volume)
-{
-    /* *INDENT-OFF* */
-	_asm
-	{
-
-		push	edi
-		push	esi
-		push	ebx
-		
-		mov		edi, dst	//movl	%0,%%edi	// edi = dst
-		mov		esi, src	//%1,%%esi	// esi = src
-		mov		eax, volume	//%3,%%eax	// eax = volume
-
-		movd	mm0, eax	//%%eax,%%mm0
-		movq	mm1, mm0	//%%mm0,%%mm1
-		psllq	mm0, 16		//$16,%%mm0
-		por		mm0, mm1	//%%mm1,%%mm0
-		psllq	mm0, 16		//$16,%%mm0
-		por		mm0, mm1	//%%mm1,%%mm0
-		psllq	mm0, 16		//$16,%%mm0
-		por		mm0, mm1	//%%mm1,%%mm0
-		
-		mov		ebx, nSize	//%2,%%ebx	// ebx = size
-		shr		ebx, 3		//$3,%%ebx	// process 8 bytes per iteration = 8 samples
-		cmp		ebx, 0		//$0,%%ebx
-		je		endS8
-
-		#ifndef __WATCOMC__
-		align 16
-		#endif
-mixloopS8:
-		pxor	mm2, mm2	//%%mm2,%%mm2		// mm2 = 0
-		movq	mm1, [esi]	//(%%esi),%%mm1	// mm1 = a|b|c|d|e|f|g|h
-		movq	mm3, mm1	//%%mm1,%%mm3 	// mm3 = a|b|c|d|e|f|g|h
-		// on va faire le "sign extension" en faisant un cmp avec 0 qui retourne 1 si <0, 0 si >0
-		pcmpgtb		mm2, mm1	//%%mm1,%%mm2	// mm2 = 11111111|00000000|00000000....
-		punpckhbw	mm1, mm2	//%%mm2,%%mm1	// mm1 = 0|a|0|b|0|c|0|d
-		punpcklbw	mm3, mm2	//%%mm2,%%mm3	// mm3 = 0|e|0|f|0|g|0|h
-		movq	mm2, [edi]	//(%%edi),%%mm2	// mm2 = destination
-		pmullw	mm1, mm0	//%%mm0,%%mm1	// mm1 = v*a|v*b|v*c|v*d
-		add		esi, 8		//$8,%%esi
-		pmullw	mm3, mm0	//%%mm0,%%mm3	// mm3 = v*e|v*f|v*g|v*h
-		psraw	mm1, 7		//$7,%%mm1		// mm1 = v*a/128|v*b/128|v*c/128|v*d/128 
-		psraw	mm3, 7		//$7,%%mm3		// mm3 = v*e/128|v*f/128|v*g/128|v*h/128
-		packsswb mm3, mm1	//%%mm1,%%mm3	// mm1 = v*a/128|v*b/128|v*c/128|v*d/128|v*e/128|v*f/128|v*g/128|v*h/128
-		paddsb	mm3, mm2	//%%mm2,%%mm3	// add to destination buffer
-		movq	[edi], mm3	//%%mm3,(%%edi)	// store back to ram
-		add		edi, 8		//$8,%%edi
-		dec		ebx			//%%ebx
-		jnz		mixloopS8
-		
-endS8:
-		emms
-		
-		pop		ebx
-		pop		esi
-		pop		edi
-	}
-    /* *INDENT-ON* */
-}
-
-#endif /* SDL_ASSEMBLY_ROUTINES */
-#endif /* SDL_BUGGY_MMX_MIXERS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/SDL_mixer_MMX_VC.h b/src/audio/SDL_mixer_MMX_VC.h
deleted file mode 100644
index adace2b3..00000000
--- a/src/audio/SDL_mixer_MMX_VC.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2011 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#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)
-   Converted to Intel ASM notation by Cth
-   This code is licensed under the LGPL (see COPYING for details)
-   
-   Assumes buffer size in bytes is a multiple of 16
-   Assumes SDL_MIX_MAXVOLUME = 128
-*/
-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: */
diff --git a/src/audio/SDL_mixer_m68k.c b/src/audio/SDL_mixer_m68k.c
deleted file mode 100644
index dff1f7ee..00000000
--- a/src/audio/SDL_mixer_m68k.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2011 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/*
-	m68k assembly mix routines
-
-	Patrice Mandin
-*/
-
-#if defined(__M68000__) && !defined(__mcoldfire__) && defined(__GNUC__)
-void
-SDL_MixAudio_m68k_U8(char *dst, char *src, long len, long volume, char *mix8)
-{
-    __asm__ __volatile__("tstl	%2\n" "	beqs	stoploop_u8\n" "mixloop_u8:\n"
-                         /* Mix a sample */
-                         "	moveq	#0,%%d0\n" "	moveq	#0,%%d1\n" "	moveb	%1@+,%%d0\n"    /* d0 = *src++ */
-                         "	sub	#128,%%d0\n"    /* d0 -= 128 */
-                         "	muls	%3,%%d0\n"      /* d0 *= volume (0<=volume<=128) */
-                         "	moveb	%0@,%%d1\n"     /* d1 = *dst */
-                         "	asr	#7,%%d0\n"      /* d0 /= 128 (SDL_MIX_MAXVOLUME) */
-                         "	add	#128,%%d0\n"    /* d0 += 128 */
-                         "	add	%%d1,%%d0\n"
-                         "	moveb	%4@(%%d0:w),%0@+\n"
-                         /* Loop till done */
-                         "	subql	#1,%2\n" "	bhis	mixloop_u8\n" "stoploop_u8:\n": /* no return value */
-                         :      /* input */
-                         "a"(dst), "a"(src), "d"(len), "d"(volume), "a"(mix8):  /* clobbered registers */
-                         "d0", "d1", "cc", "memory");
-}
-
-void
-SDL_MixAudio_m68k_S8(char *dst, char *src, long len, long volume)
-{
-    __asm__ __volatile__("tstl	%2\n"
-                         "	beqs	stoploop_s8\n"
-                         "	moveq	#-128,%%d2\n"
-                         "	moveq	#127,%%d3\n" "mixloop_s8:\n"
-                         /* Mix a sample */
-                         "	moveq	#0,%%d0\n" "	moveq	#0,%%d1\n" "	moveb	%1@+,%%d0\n"    /* d0 = *src++ */
-                         "	muls	%3,%%d0\n"      /* d0 *= volume (0<=volume<=128) */
-                         "	moveb	%0@,%%d1\n"     /* d1 = *dst */
-                         "	asr	#7,%%d0\n"      /* d0 /= 128 (SDL_MIX_MAXVOLUME) */
-                         "	add	%%d1,%%d0\n"
-                         "	cmp	%%d2,%%d0\n"
-                         "	bges	lower_limit_s8\n"
-                         "	move	%%d2,%%d0\n"
-                         "lower_limit_s8:\n"
-                         "	cmp	%%d3,%%d0\n"
-                         "	bles	upper_limit_s8\n"
-                         "	move	%%d3,%%d0\n"
-                         "upper_limit_s8:\n" "	moveb	%%d0,%0@+\n"
-                         /* Loop till done */
-                         "	subql	#1,%2\n" "	bhis	mixloop_s8\n" "stoploop_s8:\n": /* no return value */
-                         :      /* input */
-                         "a"(dst), "a"(src), "d"(len), "d"(volume):     /* clobbered registers */
-                         "d0", "d1", "d2", "d3", "cc", "memory");
-}
-
-void
-SDL_MixAudio_m68k_S16MSB(short *dst, short *src, long len, long volume)
-{
-    __asm__ __volatile__("tstl	%2\n"
-                         "	beqs	stoploop_s16msb\n"
-                         "	movel	#-32768,%%d2\n"
-                         "	movel	#32767,%%d3\n"
-                         "	lsrl	#1,%2\n" "mixloop_s16msb:\n"
-                         /* Mix a sample */
-                         "	move	%1@+,%%d0\n"    /* d0 = *src++ */
-                         "	muls	%3,%%d0\n"      /* d0 *= volume (0<=volume<=128) */
-                         "	move	%0@,%%d1\n"     /* d1 = *dst */
-                         "	extl	%%d1\n" /* extend d1 to 32 bits */
-                         "	asrl	#7,%%d0\n"      /* d0 /= 128 (SDL_MIX_MAXVOLUME) */
-                         "	addl	%%d1,%%d0\n"
-                         "	cmpl	%%d2,%%d0\n"
-                         "	bges	lower_limit_s16msb\n"
-                         "	move	%%d2,%%d0\n"
-                         "lower_limit_s16msb:\n"
-                         "	cmpl	%%d3,%%d0\n"
-                         "	bles	upper_limit_s16msb\n"
-                         "	move	%%d3,%%d0\n"
-                         "upper_limit_s16msb:\n" "	move	%%d0,%0@+\n"
-                         /* Loop till done */
-                         "	subql	#1,%2\n" "	bhis	mixloop_s16msb\n" "stoploop_s16msb:\n": /* no return value */
-                         :      /* input */
-                         "a"(dst), "a"(src), "d"(len), "d"(volume):     /* clobbered registers */
-                         "d0", "d1", "d2", "d3", "cc", "memory");
-}
-
-void
-SDL_MixAudio_m68k_S16LSB(short *dst, short *src, long len, long volume)
-{
-    __asm__ __volatile__("tstl	%2\n"
-                         "	beqs	stoploop_s16lsb\n"
-                         "	movel	#-32768,%%d2\n"
-                         "	movel	#32767,%%d3\n"
-                         "	lsrl	#1,%2\n" "mixloop_s16lsb:\n"
-                         /* Mix a sample */
-                         "	move	%1@+,%%d0\n"    /* d0 = *src++ */
-                         "	rorw	#8,%%d0\n" "	muls	%3,%%d0\n"      /* d0 *= volume (0<=volume<=128) */
-                         "	move	%0@,%%d1\n"     /* d1 = *dst */
-                         "	rorw	#8,%%d1\n" "	extl	%%d1\n" /* extend d1 to 32 bits */
-                         "	asrl	#7,%%d0\n"      /* d0 /= 128 (SDL_MIX_MAXVOLUME) */
-                         "	addl	%%d1,%%d0\n"
-                         "	cmpl	%%d2,%%d0\n"
-                         "	bges	lower_limit_s16lsb\n"
-                         "	move	%%d2,%%d0\n"
-                         "lower_limit_s16lsb:\n"
-                         "	cmpl	%%d3,%%d0\n"
-                         "	bles	upper_limit_s16lsb\n"
-                         "	move	%%d3,%%d0\n"
-                         "upper_limit_s16lsb:\n"
-                         "	rorw	#8,%%d0\n" "	move	%%d0,%0@+\n"
-                         /* Loop till done */
-                         "	subql	#1,%2\n" "	bhis	mixloop_s16lsb\n" "stoploop_s16lsb:\n": /* no return value */
-                         :      /* input */
-                         "a"(dst), "a"(src), "d"(len), "d"(volume):     /* clobbered registers */
-                         "d0", "d1", "d2", "d3", "cc", "memory");
-}
-#endif
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/SDL_mixer_m68k.h b/src/audio/SDL_mixer_m68k.h
deleted file mode 100644
index ee6365fe..00000000
--- a/src/audio/SDL_mixer_m68k.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2011 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/*
-	m68k assembly mix routines
-
-	Patrice Mandin
-*/
-
-#if defined(__M68000__) && defined(__GNUC__)
-void SDL_MixAudio_m68k_U8(char *dst, char *src, long len, long volume,
-                          char *mix8);
-void SDL_MixAudio_m68k_S8(char *dst, char *src, long len, long volume);
-
-void SDL_MixAudio_m68k_S16MSB(short *dst, short *src, long len, long volume);
-void SDL_MixAudio_m68k_S16LSB(short *dst, short *src, long len, long volume);
-#endif
-/* vi: set ts=4 sw=4 expandtab: */