Removed buggy and LGPL MMX mixing routines.
authorSam Lantinga <slouken@libsdl.org>
Fri, 08 Apr 2011 13:16:33 -0700
changeset 553605af1b9ff46d
parent 5535 96594ac5fd1a
child 5537 8a66741be632
Removed buggy and LGPL MMX mixing routines.
Makefile.ds
VisualC/SDL/SDL_VS2005.vcproj
VisualC/SDL/SDL_VS2008.vcproj
VisualC/SDL/SDL_VS2010.vcxproj
VisualCE/SDL/SDL.vcp
Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj
Xcode/SDL/SDL.xcodeproj/project.pbxproj
src/audio/SDL_mixer.c
src/audio/SDL_mixer_MMX.c
src/audio/SDL_mixer_MMX.h
src/audio/SDL_mixer_MMX_VC.c
src/audio/SDL_mixer_MMX_VC.h
src/audio/SDL_mixer_m68k.c
src/audio/SDL_mixer_m68k.h
     1.1 --- a/Makefile.ds	Fri Apr 08 13:03:26 2011 -0700
     1.2 +++ b/Makefile.ds	Fri Apr 08 13:16:33 2011 -0700
     1.3 @@ -84,9 +84,6 @@
     1.4  			audio/SDL_audiodev.c \
     1.5  			audio/SDL_audiotypecvt.c \
     1.6  			audio/SDL_mixer.c \
     1.7 -			audio/SDL_mixer_MMX.c \
     1.8 -			audio/SDL_mixer_MMX_VC.c \
     1.9 -			audio/SDL_mixer_m68k.c \
    1.10  			audio/SDL_wave.c \
    1.11  			audio/nds/SDL_ndsaudio.c \
    1.12  			cpuinfo/SDL_cpuinfo.c \
     2.1 --- a/VisualC/SDL/SDL_VS2005.vcproj	Fri Apr 08 13:03:26 2011 -0700
     2.2 +++ b/VisualC/SDL/SDL_VS2005.vcproj	Fri Apr 08 13:16:33 2011 -0700
     2.3 @@ -940,30 +940,6 @@
     2.4  			>
     2.5  		</File>
     2.6  		<File
     2.7 -			RelativePath="..\..\src\audio\SDL_mixer_m68k.c"
     2.8 -			>
     2.9 -		</File>
    2.10 -		<File
    2.11 -			RelativePath="..\..\src\audio\SDL_mixer_m68k.h"
    2.12 -			>
    2.13 -		</File>
    2.14 -		<File
    2.15 -			RelativePath="..\..\src\audio\SDL_mixer_MMX.c"
    2.16 -			>
    2.17 -		</File>
    2.18 -		<File
    2.19 -			RelativePath="..\..\src\audio\SDL_mixer_MMX.h"
    2.20 -			>
    2.21 -		</File>
    2.22 -		<File
    2.23 -			RelativePath="..\..\src\audio\SDL_mixer_MMX_VC.c"
    2.24 -			>
    2.25 -		</File>
    2.26 -		<File
    2.27 -			RelativePath="..\..\src\audio\SDL_mixer_MMX_VC.h"
    2.28 -			>
    2.29 -		</File>
    2.30 -		<File
    2.31  			RelativePath="..\..\src\joystick\windows\SDL_mmjoystick.c"
    2.32  			>
    2.33  		</File>
     3.1 --- a/VisualC/SDL/SDL_VS2008.vcproj	Fri Apr 08 13:03:26 2011 -0700
     3.2 +++ b/VisualC/SDL/SDL_VS2008.vcproj	Fri Apr 08 13:16:33 2011 -0700
     3.3 @@ -929,30 +929,6 @@
     3.4  			>
     3.5  		</File>
     3.6  		<File
     3.7 -			RelativePath="..\..\src\audio\SDL_mixer_m68k.c"
     3.8 -			>
     3.9 -		</File>
    3.10 -		<File
    3.11 -			RelativePath="..\..\src\audio\SDL_mixer_m68k.h"
    3.12 -			>
    3.13 -		</File>
    3.14 -		<File
    3.15 -			RelativePath="..\..\src\audio\SDL_mixer_MMX.c"
    3.16 -			>
    3.17 -		</File>
    3.18 -		<File
    3.19 -			RelativePath="..\..\src\audio\SDL_mixer_MMX.h"
    3.20 -			>
    3.21 -		</File>
    3.22 -		<File
    3.23 -			RelativePath="..\..\src\audio\SDL_mixer_MMX_VC.c"
    3.24 -			>
    3.25 -		</File>
    3.26 -		<File
    3.27 -			RelativePath="..\..\src\audio\SDL_mixer_MMX_VC.h"
    3.28 -			>
    3.29 -		</File>
    3.30 -		<File
    3.31  			RelativePath="..\..\src\joystick\windows\SDL_mmjoystick.c"
    3.32  			>
    3.33  		</File>
     4.1 --- a/VisualC/SDL/SDL_VS2010.vcxproj	Fri Apr 08 13:03:26 2011 -0700
     4.2 +++ b/VisualC/SDL/SDL_VS2010.vcxproj	Fri Apr 08 13:16:33 2011 -0700
     4.3 @@ -295,9 +295,6 @@
     4.4      <ClInclude Include="..\..\src\video\SDL_glfuncs.h" />
     4.5      <ClInclude Include="..\..\src\joystick\SDL_joystick_c.h" />
     4.6      <ClInclude Include="..\..\src\events\SDL_keyboard_c.h" />
     4.7 -    <ClInclude Include="..\..\src\audio\SDL_mixer_m68k.h" />
     4.8 -    <ClInclude Include="..\..\src\audio\SDL_mixer_MMX.h" />
     4.9 -    <ClInclude Include="..\..\src\audio\SDL_mixer_MMX_VC.h" />
    4.10      <ClInclude Include="..\..\src\events\SDL_mouse_c.h" />
    4.11      <ClInclude Include="..\..\src\video\dummy\SDL_nullevents_c.h" />
    4.12      <ClInclude Include="..\..\src\video\dummy\SDL_nullvideo.h" />
    4.13 @@ -403,9 +400,6 @@
    4.14      <ClCompile Include="..\..\src\events\SDL_keyboard.c" />
    4.15      <ClCompile Include="..\..\src\stdlib\SDL_malloc.c" />
    4.16      <ClCompile Include="..\..\src\audio\SDL_mixer.c" />
    4.17 -    <ClCompile Include="..\..\src\audio\SDL_mixer_m68k.c" />
    4.18 -    <ClCompile Include="..\..\src\audio\SDL_mixer_MMX.c" />
    4.19 -    <ClCompile Include="..\..\src\audio\SDL_mixer_MMX_VC.c" />
    4.20      <ClCompile Include="..\..\src\joystick\windows\SDL_mmjoystick.c" />
    4.21      <ClCompile Include="..\..\src\events\SDL_mouse.c" />
    4.22      <ClCompile Include="..\..\src\video\dummy\SDL_nullevents.c" />
    4.23 @@ -450,4 +444,4 @@
    4.24    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    4.25    <ImportGroup Label="ExtensionTargets">
    4.26    </ImportGroup>
    4.27 -</Project>
    4.28 \ No newline at end of file
    4.29 +</Project>
     5.1 --- a/VisualCE/SDL/SDL.vcp	Fri Apr 08 13:03:26 2011 -0700
     5.2 +++ b/VisualCE/SDL/SDL.vcp	Fri Apr 08 13:16:33 2011 -0700
     5.3 @@ -20730,9 +20730,6 @@
     5.4  !IF  "$(CFG)" == "SDL - Win32 (WCE MIPSII_FP) Release"
     5.5  
     5.6  DEP_CPP_SDL_MI=\
     5.7 -	"..\..\src\audio\SDL_mixer_m68k.h"\
     5.8 -	"..\..\src\audio\SDL_mixer_MMX.h"\
     5.9 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
    5.10  	"..\..\src\audio\SDL_sysaudio.h"\
    5.11  	
    5.12  NODEP_CPP_SDL_MI=\
    5.13 @@ -20753,9 +20750,6 @@
    5.14  !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSII_FP) Debug"
    5.15  
    5.16  DEP_CPP_SDL_MI=\
    5.17 -	"..\..\src\audio\SDL_mixer_m68k.h"\
    5.18 -	"..\..\src\audio\SDL_mixer_MMX.h"\
    5.19 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
    5.20  	"..\..\src\audio\SDL_sysaudio.h"\
    5.21  	
    5.22  NODEP_CPP_SDL_MI=\
    5.23 @@ -20776,9 +20770,6 @@
    5.24  !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSII) Release"
    5.25  
    5.26  DEP_CPP_SDL_MI=\
    5.27 -	"..\..\src\audio\SDL_mixer_m68k.h"\
    5.28 -	"..\..\src\audio\SDL_mixer_MMX.h"\
    5.29 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
    5.30  	"..\..\src\audio\SDL_sysaudio.h"\
    5.31  	
    5.32  NODEP_CPP_SDL_MI=\
    5.33 @@ -20799,9 +20790,6 @@
    5.34  !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSII) Debug"
    5.35  
    5.36  DEP_CPP_SDL_MI=\
    5.37 -	"..\..\src\audio\SDL_mixer_m68k.h"\
    5.38 -	"..\..\src\audio\SDL_mixer_MMX.h"\
    5.39 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
    5.40  	"..\..\src\audio\SDL_sysaudio.h"\
    5.41  	
    5.42  NODEP_CPP_SDL_MI=\
    5.43 @@ -20824,9 +20812,6 @@
    5.44  DEP_CPP_SDL_MI=\
    5.45  	"..\..\include\SDL_cpuinfo.h"\
    5.46  	"..\..\include\SDL_thread.h"\
    5.47 -	"..\..\src\audio\SDL_mixer_m68k.h"\
    5.48 -	"..\..\src\audio\SDL_mixer_MMX.h"\
    5.49 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
    5.50  	"..\..\src\audio\SDL_sysaudio.h"\
    5.51  	
    5.52  NODEP_CPP_SDL_MI=\
    5.53 @@ -20847,9 +20832,6 @@
    5.54  DEP_CPP_SDL_MI=\
    5.55  	"..\..\include\SDL_cpuinfo.h"\
    5.56  	"..\..\include\SDL_thread.h"\
    5.57 -	"..\..\src\audio\SDL_mixer_m68k.h"\
    5.58 -	"..\..\src\audio\SDL_mixer_MMX.h"\
    5.59 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
    5.60  	"..\..\src\audio\SDL_sysaudio.h"\
    5.61  	
    5.62  NODEP_CPP_SDL_MI=\
    5.63 @@ -20880,18 +20862,12 @@
    5.64  	"..\..\include\SDL_thread.h"\
    5.65  	"..\..\include\SDL_timer.h"\
    5.66  	"..\..\include\SDL_types.h"\
    5.67 -	"..\..\src\audio\SDL_mixer_m68k.h"\
    5.68 -	"..\..\src\audio\SDL_mixer_MMX.h"\
    5.69 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
    5.70  	"..\..\src\audio\SDL_sysaudio.h"\
    5.71  	
    5.72  
    5.73  !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSIV) Release"
    5.74  
    5.75  DEP_CPP_SDL_MI=\
    5.76 -	"..\..\src\audio\SDL_mixer_m68k.h"\
    5.77 -	"..\..\src\audio\SDL_mixer_MMX.h"\
    5.78 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
    5.79  	"..\..\src\audio\SDL_sysaudio.h"\
    5.80  	
    5.81  NODEP_CPP_SDL_MI=\
    5.82 @@ -20912,9 +20888,6 @@
    5.83  !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSIV) Debug"
    5.84  
    5.85  DEP_CPP_SDL_MI=\
    5.86 -	"..\..\src\audio\SDL_mixer_m68k.h"\
    5.87 -	"..\..\src\audio\SDL_mixer_MMX.h"\
    5.88 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
    5.89  	"..\..\src\audio\SDL_sysaudio.h"\
    5.90  	
    5.91  NODEP_CPP_SDL_MI=\
    5.92 @@ -20935,9 +20908,6 @@
    5.93  !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE emulator) Release"
    5.94  
    5.95  DEP_CPP_SDL_MI=\
    5.96 -	"..\..\src\audio\SDL_mixer_m68k.h"\
    5.97 -	"..\..\src\audio\SDL_mixer_MMX.h"\
    5.98 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
    5.99  	"..\..\src\audio\SDL_sysaudio.h"\
   5.100  	
   5.101  NODEP_CPP_SDL_MI=\
   5.102 @@ -20958,9 +20928,6 @@
   5.103  !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE emulator) Debug"
   5.104  
   5.105  DEP_CPP_SDL_MI=\
   5.106 -	"..\..\src\audio\SDL_mixer_m68k.h"\
   5.107 -	"..\..\src\audio\SDL_mixer_MMX.h"\
   5.108 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.109  	"..\..\src\audio\SDL_sysaudio.h"\
   5.110  	
   5.111  NODEP_CPP_SDL_MI=\
   5.112 @@ -20989,9 +20956,6 @@
   5.113  !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARMV4I) Release"
   5.114  
   5.115  DEP_CPP_SDL_MI=\
   5.116 -	"..\..\src\audio\SDL_mixer_m68k.h"\
   5.117 -	"..\..\src\audio\SDL_mixer_MMX.h"\
   5.118 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.119  	"..\..\src\audio\SDL_sysaudio.h"\
   5.120  	
   5.121  NODEP_CPP_SDL_MI=\
   5.122 @@ -21012,9 +20976,6 @@
   5.123  !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARMV4I) Debug"
   5.124  
   5.125  DEP_CPP_SDL_MI=\
   5.126 -	"..\..\src\audio\SDL_mixer_m68k.h"\
   5.127 -	"..\..\src\audio\SDL_mixer_MMX.h"\
   5.128 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.129  	"..\..\src\audio\SDL_sysaudio.h"\
   5.130  	
   5.131  NODEP_CPP_SDL_MI=\
   5.132 @@ -21035,9 +20996,6 @@
   5.133  !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSIV_FP) Release"
   5.134  
   5.135  DEP_CPP_SDL_MI=\
   5.136 -	"..\..\src\audio\SDL_mixer_m68k.h"\
   5.137 -	"..\..\src\audio\SDL_mixer_MMX.h"\
   5.138 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.139  	"..\..\src\audio\SDL_sysaudio.h"\
   5.140  	
   5.141  NODEP_CPP_SDL_MI=\
   5.142 @@ -21058,9 +21016,6 @@
   5.143  !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSIV_FP) Debug"
   5.144  
   5.145  DEP_CPP_SDL_MI=\
   5.146 -	"..\..\src\audio\SDL_mixer_m68k.h"\
   5.147 -	"..\..\src\audio\SDL_mixer_MMX.h"\
   5.148 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.149  	"..\..\src\audio\SDL_sysaudio.h"\
   5.150  	
   5.151  NODEP_CPP_SDL_MI=\
   5.152 @@ -21081,9 +21036,6 @@
   5.153  !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARMV4) Release"
   5.154  
   5.155  DEP_CPP_SDL_MI=\
   5.156 -	"..\..\src\audio\SDL_mixer_m68k.h"\
   5.157 -	"..\..\src\audio\SDL_mixer_MMX.h"\
   5.158 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.159  	"..\..\src\audio\SDL_sysaudio.h"\
   5.160  	
   5.161  NODEP_CPP_SDL_MI=\
   5.162 @@ -21112,9 +21064,6 @@
   5.163  !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARMV4) Debug"
   5.164  
   5.165  DEP_CPP_SDL_MI=\
   5.166 -	"..\..\src\audio\SDL_mixer_m68k.h"\
   5.167 -	"..\..\src\audio\SDL_mixer_MMX.h"\
   5.168 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.169  	"..\..\src\audio\SDL_sysaudio.h"\
   5.170  	
   5.171  NODEP_CPP_SDL_MI=\
   5.172 @@ -21145,9 +21094,6 @@
   5.173  DEP_CPP_SDL_MI=\
   5.174  	"..\..\include\SDL_cpuinfo.h"\
   5.175  	"..\..\include\SDL_thread.h"\
   5.176 -	"..\..\src\audio\SDL_mixer_m68k.h"\
   5.177 -	"..\..\src\audio\SDL_mixer_MMX.h"\
   5.178 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.179  	"..\..\src\audio\SDL_sysaudio.h"\
   5.180  	
   5.181  NODEP_CPP_SDL_MI=\
   5.182 @@ -21168,9 +21114,6 @@
   5.183  DEP_CPP_SDL_MI=\
   5.184  	"..\..\include\SDL_cpuinfo.h"\
   5.185  	"..\..\include\SDL_thread.h"\
   5.186 -	"..\..\src\audio\SDL_mixer_m68k.h"\
   5.187 -	"..\..\src\audio\SDL_mixer_MMX.h"\
   5.188 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.189  	"..\..\src\audio\SDL_sysaudio.h"\
   5.190  	
   5.191  NODEP_CPP_SDL_MI=\
   5.192 @@ -21189,9 +21132,6 @@
   5.193  !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARMV4T) Release"
   5.194  
   5.195  DEP_CPP_SDL_MI=\
   5.196 -	"..\..\src\audio\SDL_mixer_m68k.h"\
   5.197 -	"..\..\src\audio\SDL_mixer_MMX.h"\
   5.198 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.199  	"..\..\src\audio\SDL_sysaudio.h"\
   5.200  	
   5.201  NODEP_CPP_SDL_MI=\
   5.202 @@ -21212,9 +21152,6 @@
   5.203  !ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARMV4T) Debug"
   5.204  
   5.205  DEP_CPP_SDL_MI=\
   5.206 -	"..\..\src\audio\SDL_mixer_m68k.h"\
   5.207 -	"..\..\src\audio\SDL_mixer_MMX.h"\
   5.208 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.209  	"..\..\src\audio\SDL_sysaudio.h"\
   5.210  	
   5.211  NODEP_CPP_SDL_MI=\
   5.212 @@ -21237,9 +21174,6 @@
   5.213  DEP_CPP_SDL_MI=\
   5.214  	"..\..\include\SDL_cpuinfo.h"\
   5.215  	"..\..\include\SDL_thread.h"\
   5.216 -	"..\..\src\audio\SDL_mixer_m68k.h"\
   5.217 -	"..\..\src\audio\SDL_mixer_MMX.h"\
   5.218 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.219  	"..\..\src\audio\SDL_sysaudio.h"\
   5.220  	
   5.221  NODEP_CPP_SDL_MI=\
   5.222 @@ -21277,9 +21211,6 @@
   5.223  	"..\..\include\SDL_stdinc.h"\
   5.224  	"..\..\include\SDL_thread.h"\
   5.225  	"..\..\include\SDL_timer.h"\
   5.226 -	"..\..\src\audio\SDL_mixer_m68k.h"\
   5.227 -	"..\..\src\audio\SDL_mixer_MMX.h"\
   5.228 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.229  	"..\..\src\audio\SDL_sysaudio.h"\
   5.230  	
   5.231  
   5.232 @@ -21305,9 +21236,6 @@
   5.233  	"..\..\include\SDL_stdinc.h"\
   5.234  	"..\..\include\SDL_thread.h"\
   5.235  	"..\..\include\SDL_timer.h"\
   5.236 -	"..\..\src\audio\SDL_mixer_m68k.h"\
   5.237 -	"..\..\src\audio\SDL_mixer_MMX.h"\
   5.238 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.239  	"..\..\src\audio\SDL_sysaudio.h"\
   5.240  	
   5.241  
   5.242 @@ -21333,9 +21261,6 @@
   5.243  	"..\..\include\SDL_stdinc.h"\
   5.244  	"..\..\include\SDL_thread.h"\
   5.245  	"..\..\include\SDL_timer.h"\
   5.246 -	"..\..\src\audio\SDL_mixer_m68k.h"\
   5.247 -	"..\..\src\audio\SDL_mixer_MMX.h"\
   5.248 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.249  	"..\..\src\audio\SDL_sysaudio.h"\
   5.250  	
   5.251  NODEP_CPP_SDL_MI=\
   5.252 @@ -21347,9 +21272,6 @@
   5.253  DEP_CPP_SDL_MI=\
   5.254  	"..\..\include\SDL_cpuinfo.h"\
   5.255  	"..\..\include\SDL_thread.h"\
   5.256 -	"..\..\src\audio\SDL_mixer_m68k.h"\
   5.257 -	"..\..\src\audio\SDL_mixer_MMX.h"\
   5.258 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.259  	"..\..\src\audio\SDL_sysaudio.h"\
   5.260  	
   5.261  NODEP_CPP_SDL_MI=\
   5.262 @@ -21370,9 +21292,6 @@
   5.263  DEP_CPP_SDL_MI=\
   5.264  	"..\..\include\SDL_cpuinfo.h"\
   5.265  	"..\..\include\SDL_thread.h"\
   5.266 -	"..\..\src\audio\SDL_mixer_m68k.h"\
   5.267 -	"..\..\src\audio\SDL_mixer_MMX.h"\
   5.268 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.269  	"..\..\src\audio\SDL_sysaudio.h"\
   5.270  	
   5.271  NODEP_CPP_SDL_MI=\
   5.272 @@ -21403,487 +21322,7 @@
   5.273  	"..\..\include\SDL_thread.h"\
   5.274  	"..\..\include\SDL_timer.h"\
   5.275  	"..\..\include\SDL_types.h"\
   5.276 -	"..\..\src\audio\SDL_mixer_m68k.h"\
   5.277 -	"..\..\src\audio\SDL_mixer_MMX.h"\
   5.278 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.279 -	"..\..\src\audio\SDL_sysaudio.h"\
   5.280 -	
   5.281 -
   5.282 -!ENDIF 
   5.283 -
   5.284 -# End Source File
   5.285 -# Begin Source File
   5.286 -
   5.287 -SOURCE=..\..\src\audio\SDL_mixer_MMX_VC.c
   5.288 -
   5.289 -!IF  "$(CFG)" == "SDL - Win32 (WCE MIPSII_FP) Release"
   5.290 -
   5.291 -DEP_CPP_SDL_MIX=\
   5.292 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.293 -	
   5.294 -NODEP_CPP_SDL_MIX=\
   5.295 -	"..\include\SDL_config.h"\
   5.296 -	"..\include\SDL_config_amiga.h"\
   5.297 -	"..\include\SDL_config_dreamcast.h"\
   5.298 -	"..\include\SDL_config_macos.h"\
   5.299 -	"..\include\SDL_config_macosx.h"\
   5.300 -	"..\include\SDL_config_os2.h"\
   5.301 -	"..\include\SDL_config_win32.h"\
   5.302 -	"..\include\SDL_config_wince.h"\
   5.303 -	"..\include\SDL_platform.h"\
   5.304 -	
   5.305 -
   5.306 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSII_FP) Debug"
   5.307 -
   5.308 -DEP_CPP_SDL_MIX=\
   5.309 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.310 -	
   5.311 -NODEP_CPP_SDL_MIX=\
   5.312 -	"..\include\SDL_config.h"\
   5.313 -	"..\include\SDL_config_amiga.h"\
   5.314 -	"..\include\SDL_config_dreamcast.h"\
   5.315 -	"..\include\SDL_config_macos.h"\
   5.316 -	"..\include\SDL_config_macosx.h"\
   5.317 -	"..\include\SDL_config_os2.h"\
   5.318 -	"..\include\SDL_config_win32.h"\
   5.319 -	"..\include\SDL_config_wince.h"\
   5.320 -	"..\include\SDL_platform.h"\
   5.321 -	
   5.322 -
   5.323 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSII) Release"
   5.324 -
   5.325 -DEP_CPP_SDL_MIX=\
   5.326 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.327 -	
   5.328 -NODEP_CPP_SDL_MIX=\
   5.329 -	"..\include\SDL_config.h"\
   5.330 -	"..\include\SDL_config_amiga.h"\
   5.331 -	"..\include\SDL_config_dreamcast.h"\
   5.332 -	"..\include\SDL_config_macos.h"\
   5.333 -	"..\include\SDL_config_macosx.h"\
   5.334 -	"..\include\SDL_config_os2.h"\
   5.335 -	"..\include\SDL_config_win32.h"\
   5.336 -	"..\include\SDL_config_wince.h"\
   5.337 -	"..\include\SDL_platform.h"\
   5.338 -	
   5.339 -
   5.340 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSII) Debug"
   5.341 -
   5.342 -DEP_CPP_SDL_MIX=\
   5.343 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.344 -	
   5.345 -NODEP_CPP_SDL_MIX=\
   5.346 -	"..\include\SDL_config.h"\
   5.347 -	"..\include\SDL_config_amiga.h"\
   5.348 -	"..\include\SDL_config_dreamcast.h"\
   5.349 -	"..\include\SDL_config_macos.h"\
   5.350 -	"..\include\SDL_config_macosx.h"\
   5.351 -	"..\include\SDL_config_os2.h"\
   5.352 -	"..\include\SDL_config_win32.h"\
   5.353 -	"..\include\SDL_config_wince.h"\
   5.354 -	"..\include\SDL_platform.h"\
   5.355 -	
   5.356 -
   5.357 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE SH4) Release"
   5.358 -
   5.359 -DEP_CPP_SDL_MIX=\
   5.360 -	"..\..\include\SDL_config.h"\
   5.361 -	"..\..\include\SDL_config_amiga.h"\
   5.362 -	"..\..\include\SDL_config_dreamcast.h"\
   5.363 -	"..\..\include\SDL_config_macos.h"\
   5.364 -	"..\..\include\SDL_config_macosx.h"\
   5.365 -	"..\..\include\SDL_config_os2.h"\
   5.366 -	"..\..\include\SDL_config_win32.h"\
   5.367 -	"..\..\include\SDL_platform.h"\
   5.368 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.369 -	
   5.370 -NODEP_CPP_SDL_MIX=\
   5.371 -	"..\include\SDL_config_wince.h"\
   5.372 -	
   5.373 -
   5.374 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE SH4) Debug"
   5.375 -
   5.376 -DEP_CPP_SDL_MIX=\
   5.377 -	"..\..\include\SDL_config.h"\
   5.378 -	"..\..\include\SDL_config_amiga.h"\
   5.379 -	"..\..\include\SDL_config_dreamcast.h"\
   5.380 -	"..\..\include\SDL_config_macos.h"\
   5.381 -	"..\..\include\SDL_config_macosx.h"\
   5.382 -	"..\..\include\SDL_config_os2.h"\
   5.383 -	"..\..\include\SDL_config_win32.h"\
   5.384 -	"..\..\include\SDL_platform.h"\
   5.385 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.386 -	
   5.387 -NODEP_CPP_SDL_MIX=\
   5.388 -	"..\include\SDL_config_wince.h"\
   5.389 -	
   5.390 -
   5.391 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE SH3) Debug"
   5.392 -
   5.393 -DEP_CPP_SDL_MIX=\
   5.394 -	"..\..\include\SDL_config.h"\
   5.395 -	"..\..\include\SDL_config_amiga.h"\
   5.396 -	"..\..\include\SDL_config_dreamcast.h"\
   5.397 -	"..\..\include\SDL_config_macos.h"\
   5.398 -	"..\..\include\SDL_config_macosx.h"\
   5.399 -	"..\..\include\SDL_config_os2.h"\
   5.400 -	"..\..\include\SDL_config_win32.h"\
   5.401 -	"..\..\include\SDL_platform.h"\
   5.402 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.403 -	
   5.404 -NODEP_CPP_SDL_MIX=\
   5.405 -	"..\include\SDL_config_wince.h"\
   5.406 -	
   5.407 -
   5.408 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSIV) Release"
   5.409 -
   5.410 -DEP_CPP_SDL_MIX=\
   5.411 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.412 -	
   5.413 -NODEP_CPP_SDL_MIX=\
   5.414 -	"..\include\SDL_config.h"\
   5.415 -	"..\include\SDL_config_amiga.h"\
   5.416 -	"..\include\SDL_config_dreamcast.h"\
   5.417 -	"..\include\SDL_config_macos.h"\
   5.418 -	"..\include\SDL_config_macosx.h"\
   5.419 -	"..\include\SDL_config_os2.h"\
   5.420 -	"..\include\SDL_config_win32.h"\
   5.421 -	"..\include\SDL_config_wince.h"\
   5.422 -	"..\include\SDL_platform.h"\
   5.423 -	
   5.424 -
   5.425 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSIV) Debug"
   5.426 -
   5.427 -DEP_CPP_SDL_MIX=\
   5.428 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.429 -	
   5.430 -NODEP_CPP_SDL_MIX=\
   5.431 -	"..\include\SDL_config.h"\
   5.432 -	"..\include\SDL_config_amiga.h"\
   5.433 -	"..\include\SDL_config_dreamcast.h"\
   5.434 -	"..\include\SDL_config_macos.h"\
   5.435 -	"..\include\SDL_config_macosx.h"\
   5.436 -	"..\include\SDL_config_os2.h"\
   5.437 -	"..\include\SDL_config_win32.h"\
   5.438 -	"..\include\SDL_config_wince.h"\
   5.439 -	"..\include\SDL_platform.h"\
   5.440 -	
   5.441 -
   5.442 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE emulator) Release"
   5.443 -
   5.444 -DEP_CPP_SDL_MIX=\
   5.445 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.446 -	
   5.447 -NODEP_CPP_SDL_MIX=\
   5.448 -	"..\include\SDL_config.h"\
   5.449 -	"..\include\SDL_config_amiga.h"\
   5.450 -	"..\include\SDL_config_dreamcast.h"\
   5.451 -	"..\include\SDL_config_macos.h"\
   5.452 -	"..\include\SDL_config_macosx.h"\
   5.453 -	"..\include\SDL_config_os2.h"\
   5.454 -	"..\include\SDL_config_win32.h"\
   5.455 -	"..\include\SDL_config_wince.h"\
   5.456 -	"..\include\SDL_platform.h"\
   5.457 -	
   5.458 -
   5.459 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE emulator) Debug"
   5.460 -
   5.461 -DEP_CPP_SDL_MIX=\
   5.462 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.463 -	
   5.464 -NODEP_CPP_SDL_MIX=\
   5.465 -	"..\include\SDL_config.h"\
   5.466 -	"..\include\SDL_config_amiga.h"\
   5.467 -	"..\include\SDL_config_dreamcast.h"\
   5.468 -	"..\include\SDL_config_macos.h"\
   5.469 -	"..\include\SDL_config_macosx.h"\
   5.470 -	"..\include\SDL_config_os2.h"\
   5.471 -	"..\include\SDL_config_win32.h"\
   5.472 -	"..\include\SDL_config_wince.h"\
   5.473 -	"..\include\SDL_platform.h"\
   5.474 -	
   5.475 -
   5.476 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARMV4I) Release"
   5.477 -
   5.478 -DEP_CPP_SDL_MIX=\
   5.479 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.480 -	
   5.481 -NODEP_CPP_SDL_MIX=\
   5.482 -	"..\include\SDL_config.h"\
   5.483 -	"..\include\SDL_config_amiga.h"\
   5.484 -	"..\include\SDL_config_dreamcast.h"\
   5.485 -	"..\include\SDL_config_macos.h"\
   5.486 -	"..\include\SDL_config_macosx.h"\
   5.487 -	"..\include\SDL_config_os2.h"\
   5.488 -	"..\include\SDL_config_win32.h"\
   5.489 -	"..\include\SDL_config_wince.h"\
   5.490 -	"..\include\SDL_platform.h"\
   5.491 -	
   5.492 -
   5.493 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARMV4I) Debug"
   5.494 -
   5.495 -DEP_CPP_SDL_MIX=\
   5.496 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.497 -	
   5.498 -NODEP_CPP_SDL_MIX=\
   5.499 -	"..\include\SDL_config.h"\
   5.500 -	"..\include\SDL_config_amiga.h"\
   5.501 -	"..\include\SDL_config_dreamcast.h"\
   5.502 -	"..\include\SDL_config_macos.h"\
   5.503 -	"..\include\SDL_config_macosx.h"\
   5.504 -	"..\include\SDL_config_os2.h"\
   5.505 -	"..\include\SDL_config_win32.h"\
   5.506 -	"..\include\SDL_config_wince.h"\
   5.507 -	"..\include\SDL_platform.h"\
   5.508 -	
   5.509 -
   5.510 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSIV_FP) Release"
   5.511 -
   5.512 -DEP_CPP_SDL_MIX=\
   5.513 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.514 -	
   5.515 -NODEP_CPP_SDL_MIX=\
   5.516 -	"..\include\SDL_config.h"\
   5.517 -	"..\include\SDL_config_amiga.h"\
   5.518 -	"..\include\SDL_config_dreamcast.h"\
   5.519 -	"..\include\SDL_config_macos.h"\
   5.520 -	"..\include\SDL_config_macosx.h"\
   5.521 -	"..\include\SDL_config_os2.h"\
   5.522 -	"..\include\SDL_config_win32.h"\
   5.523 -	"..\include\SDL_config_wince.h"\
   5.524 -	"..\include\SDL_platform.h"\
   5.525 -	
   5.526 -
   5.527 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPSIV_FP) Debug"
   5.528 -
   5.529 -DEP_CPP_SDL_MIX=\
   5.530 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.531 -	
   5.532 -NODEP_CPP_SDL_MIX=\
   5.533 -	"..\include\SDL_config.h"\
   5.534 -	"..\include\SDL_config_amiga.h"\
   5.535 -	"..\include\SDL_config_dreamcast.h"\
   5.536 -	"..\include\SDL_config_macos.h"\
   5.537 -	"..\include\SDL_config_macosx.h"\
   5.538 -	"..\include\SDL_config_os2.h"\
   5.539 -	"..\include\SDL_config_win32.h"\
   5.540 -	"..\include\SDL_config_wince.h"\
   5.541 -	"..\include\SDL_platform.h"\
   5.542 -	
   5.543 -
   5.544 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARMV4) Release"
   5.545 -
   5.546 -DEP_CPP_SDL_MIX=\
   5.547 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.548 -	
   5.549 -NODEP_CPP_SDL_MIX=\
   5.550 -	"..\include\SDL_config.h"\
   5.551 -	"..\include\SDL_config_amiga.h"\
   5.552 -	"..\include\SDL_config_dreamcast.h"\
   5.553 -	"..\include\SDL_config_macos.h"\
   5.554 -	"..\include\SDL_config_macosx.h"\
   5.555 -	"..\include\SDL_config_os2.h"\
   5.556 -	"..\include\SDL_config_win32.h"\
   5.557 -	"..\include\SDL_config_wince.h"\
   5.558 -	"..\include\SDL_platform.h"\
   5.559 -	
   5.560 -
   5.561 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARMV4) Debug"
   5.562 -
   5.563 -DEP_CPP_SDL_MIX=\
   5.564 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.565 -	
   5.566 -NODEP_CPP_SDL_MIX=\
   5.567 -	"..\include\SDL_config.h"\
   5.568 -	"..\include\SDL_config_amiga.h"\
   5.569 -	"..\include\SDL_config_dreamcast.h"\
   5.570 -	"..\include\SDL_config_macos.h"\
   5.571 -	"..\include\SDL_config_macosx.h"\
   5.572 -	"..\include\SDL_config_os2.h"\
   5.573 -	"..\include\SDL_config_win32.h"\
   5.574 -	"..\include\SDL_config_wince.h"\
   5.575 -	"..\include\SDL_platform.h"\
   5.576 -	
   5.577 -
   5.578 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPS16) Release"
   5.579 -
   5.580 -DEP_CPP_SDL_MIX=\
   5.581 -	"..\..\include\SDL_config.h"\
   5.582 -	"..\..\include\SDL_config_amiga.h"\
   5.583 -	"..\..\include\SDL_config_dreamcast.h"\
   5.584 -	"..\..\include\SDL_config_macos.h"\
   5.585 -	"..\..\include\SDL_config_macosx.h"\
   5.586 -	"..\..\include\SDL_config_os2.h"\
   5.587 -	"..\..\include\SDL_config_win32.h"\
   5.588 -	"..\..\include\SDL_platform.h"\
   5.589 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.590 -	
   5.591 -NODEP_CPP_SDL_MIX=\
   5.592 -	"..\include\SDL_config_wince.h"\
   5.593 -	
   5.594 -
   5.595 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPS16) Debug"
   5.596 -
   5.597 -DEP_CPP_SDL_MIX=\
   5.598 -	"..\..\include\SDL_config.h"\
   5.599 -	"..\..\include\SDL_config_amiga.h"\
   5.600 -	"..\..\include\SDL_config_dreamcast.h"\
   5.601 -	"..\..\include\SDL_config_macos.h"\
   5.602 -	"..\..\include\SDL_config_macosx.h"\
   5.603 -	"..\..\include\SDL_config_os2.h"\
   5.604 -	"..\..\include\SDL_config_win32.h"\
   5.605 -	"..\..\include\SDL_platform.h"\
   5.606 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.607 -	
   5.608 -NODEP_CPP_SDL_MIX=\
   5.609 -	"..\include\SDL_config_wince.h"\
   5.610 -	
   5.611 -
   5.612 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARMV4T) Release"
   5.613 -
   5.614 -DEP_CPP_SDL_MIX=\
   5.615 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.616 -	
   5.617 -NODEP_CPP_SDL_MIX=\
   5.618 -	"..\include\SDL_config.h"\
   5.619 -	"..\include\SDL_config_amiga.h"\
   5.620 -	"..\include\SDL_config_dreamcast.h"\
   5.621 -	"..\include\SDL_config_macos.h"\
   5.622 -	"..\include\SDL_config_macosx.h"\
   5.623 -	"..\include\SDL_config_os2.h"\
   5.624 -	"..\include\SDL_config_win32.h"\
   5.625 -	"..\include\SDL_config_wince.h"\
   5.626 -	"..\include\SDL_platform.h"\
   5.627 -	
   5.628 -
   5.629 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARMV4T) Debug"
   5.630 -
   5.631 -DEP_CPP_SDL_MIX=\
   5.632 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.633 -	
   5.634 -NODEP_CPP_SDL_MIX=\
   5.635 -	"..\include\SDL_config.h"\
   5.636 -	"..\include\SDL_config_amiga.h"\
   5.637 -	"..\include\SDL_config_dreamcast.h"\
   5.638 -	"..\include\SDL_config_macos.h"\
   5.639 -	"..\include\SDL_config_macosx.h"\
   5.640 -	"..\include\SDL_config_os2.h"\
   5.641 -	"..\include\SDL_config_win32.h"\
   5.642 -	"..\include\SDL_config_wince.h"\
   5.643 -	"..\include\SDL_platform.h"\
   5.644 -	
   5.645 -
   5.646 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE x86) Release"
   5.647 -
   5.648 -DEP_CPP_SDL_MIX=\
   5.649 -	"..\..\include\SDL_config.h"\
   5.650 -	"..\..\include\SDL_config_amiga.h"\
   5.651 -	"..\..\include\SDL_config_dreamcast.h"\
   5.652 -	"..\..\include\SDL_config_macos.h"\
   5.653 -	"..\..\include\SDL_config_macosx.h"\
   5.654 -	"..\..\include\SDL_config_os2.h"\
   5.655 -	"..\..\include\SDL_config_win32.h"\
   5.656 -	"..\..\include\SDL_platform.h"\
   5.657 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.658 -	
   5.659 -NODEP_CPP_SDL_MIX=\
   5.660 -	"..\include\SDL_config_wince.h"\
   5.661 -	
   5.662 -
   5.663 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE x86) Debug"
   5.664 -
   5.665 -DEP_CPP_SDL_MIX=\
   5.666 -	"..\..\include\SDL_config.h"\
   5.667 -	"..\..\include\SDL_config_amiga.h"\
   5.668 -	"..\..\include\SDL_config_dreamcast.h"\
   5.669 -	"..\..\include\SDL_config_macos.h"\
   5.670 -	"..\..\include\SDL_config_macosx.h"\
   5.671 -	"..\..\include\SDL_config_os2.h"\
   5.672 -	"..\..\include\SDL_config_win32.h"\
   5.673 -	"..\..\include\SDL_platform.h"\
   5.674 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.675 -	
   5.676 -
   5.677 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARM) Debug"
   5.678 -
   5.679 -DEP_CPP_SDL_MIX=\
   5.680 -	"..\..\include\SDL_config.h"\
   5.681 -	"..\..\include\SDL_config_amiga.h"\
   5.682 -	"..\..\include\SDL_config_dreamcast.h"\
   5.683 -	"..\..\include\SDL_config_macos.h"\
   5.684 -	"..\..\include\SDL_config_macosx.h"\
   5.685 -	"..\..\include\SDL_config_os2.h"\
   5.686 -	"..\..\include\SDL_config_win32.h"\
   5.687 -	"..\..\include\SDL_platform.h"\
   5.688 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.689 -	
   5.690 -
   5.691 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE ARM) Release"
   5.692 -
   5.693 -DEP_CPP_SDL_MIX=\
   5.694 -	"..\..\include\SDL_config.h"\
   5.695 -	"..\..\include\SDL_config_amiga.h"\
   5.696 -	"..\..\include\SDL_config_dreamcast.h"\
   5.697 -	"..\..\include\SDL_config_macos.h"\
   5.698 -	"..\..\include\SDL_config_macosx.h"\
   5.699 -	"..\..\include\SDL_config_os2.h"\
   5.700 -	"..\..\include\SDL_config_win32.h"\
   5.701 -	"..\..\include\SDL_platform.h"\
   5.702 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.703 -	
   5.704 -NODEP_CPP_SDL_MIX=\
   5.705 -	"..\include\SDL_config_wince.h"\
   5.706 -	
   5.707 -
   5.708 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPS) Debug"
   5.709 -
   5.710 -DEP_CPP_SDL_MIX=\
   5.711 -	"..\..\include\SDL_config.h"\
   5.712 -	"..\..\include\SDL_config_amiga.h"\
   5.713 -	"..\..\include\SDL_config_dreamcast.h"\
   5.714 -	"..\..\include\SDL_config_macos.h"\
   5.715 -	"..\..\include\SDL_config_macosx.h"\
   5.716 -	"..\..\include\SDL_config_os2.h"\
   5.717 -	"..\..\include\SDL_config_win32.h"\
   5.718 -	"..\..\include\SDL_platform.h"\
   5.719 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.720 -	
   5.721 -NODEP_CPP_SDL_MIX=\
   5.722 -	"..\include\SDL_config_wince.h"\
   5.723 -	
   5.724 -
   5.725 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE MIPS) Release"
   5.726 -
   5.727 -DEP_CPP_SDL_MIX=\
   5.728 -	"..\..\include\SDL_config.h"\
   5.729 -	"..\..\include\SDL_config_amiga.h"\
   5.730 -	"..\..\include\SDL_config_dreamcast.h"\
   5.731 -	"..\..\include\SDL_config_macos.h"\
   5.732 -	"..\..\include\SDL_config_macosx.h"\
   5.733 -	"..\..\include\SDL_config_os2.h"\
   5.734 -	"..\..\include\SDL_config_win32.h"\
   5.735 -	"..\..\include\SDL_platform.h"\
   5.736 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.737 -	
   5.738 -NODEP_CPP_SDL_MIX=\
   5.739 -	"..\include\SDL_config_wince.h"\
   5.740 -	
   5.741 -
   5.742 -!ELSEIF  "$(CFG)" == "SDL - Win32 (WCE SH3) Release"
   5.743 -
   5.744 -DEP_CPP_SDL_MIX=\
   5.745 -	"..\..\include\SDL_config.h"\
   5.746 -	"..\..\include\SDL_config_amiga.h"\
   5.747 -	"..\..\include\SDL_config_dreamcast.h"\
   5.748 -	"..\..\include\SDL_config_macos.h"\
   5.749 -	"..\..\include\SDL_config_macosx.h"\
   5.750 -	"..\..\include\SDL_config_os2.h"\
   5.751 -	"..\..\include\SDL_config_win32.h"\
   5.752 -	"..\..\include\SDL_platform.h"\
   5.753 -	"..\..\src\audio\SDL_mixer_MMX_VC.h"\
   5.754 -	
   5.755 -NODEP_CPP_SDL_MIX=\
   5.756 -	"..\include\SDL_config_wince.h"\
   5.757 +	"..\..\src\audio\SDL_sysaudio.h"\
   5.758  	
   5.759  
   5.760  !ENDIF 
   5.761 @@ -41883,18 +41322,6 @@
   5.762  # End Source File
   5.763  # Begin Source File
   5.764  
   5.765 -SOURCE=..\..\src\audio\SDL_mixer_m68k.h
   5.766 -# End Source File
   5.767 -# Begin Source File
   5.768 -
   5.769 -SOURCE=..\..\src\audio\SDL_mixer_MMX.h
   5.770 -# End Source File
   5.771 -# Begin Source File
   5.772 -
   5.773 -SOURCE=..\..\src\audio\SDL_mixer_MMX_VC.h
   5.774 -# End Source File
   5.775 -# Begin Source File
   5.776 -
   5.777  SOURCE=..\..\include\SDL_mouse.h
   5.778  # End Source File
   5.779  # Begin Source File
     6.1 --- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj	Fri Apr 08 13:03:26 2011 -0700
     6.2 +++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj	Fri Apr 08 13:16:33 2011 -0700
     6.3 @@ -171,9 +171,6 @@
     6.4  		FD6526680DE8FCDD002AD96B /* SDL_audiocvt.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B9460DD52EDC00FB1D6B /* SDL_audiocvt.c */; };
     6.5  		FD65266A0DE8FCDD002AD96B /* SDL_audiotypecvt.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B94A0DD52EDC00FB1D6B /* SDL_audiotypecvt.c */; };
     6.6  		FD65266B0DE8FCDD002AD96B /* SDL_mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B94B0DD52EDC00FB1D6B /* SDL_mixer.c */; };
     6.7 -		FD65266C0DE8FCDD002AD96B /* SDL_mixer_m68k.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B94C0DD52EDC00FB1D6B /* SDL_mixer_m68k.c */; };
     6.8 -		FD65266D0DE8FCDD002AD96B /* SDL_mixer_MMX.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B94E0DD52EDC00FB1D6B /* SDL_mixer_MMX.c */; };
     6.9 -		FD65266E0DE8FCDD002AD96B /* SDL_mixer_MMX_VC.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B9500DD52EDC00FB1D6B /* SDL_mixer_MMX_VC.c */; };
    6.10  		FD65266F0DE8FCDD002AD96B /* SDL_wave.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B9530DD52EDC00FB1D6B /* SDL_wave.c */; };
    6.11  		FD6526700DE8FCDD002AD96B /* SDL_cpuinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B98B0DD52EDC00FB1D6B /* SDL_cpuinfo.c */; };
    6.12  		FD6526710DE8FCDD002AD96B /* SDL_events.c in Sources */ = {isa = PBXBuildFile; fileRef = FD99B9930DD52EDC00FB1D6B /* SDL_events.c */; };
    6.13 @@ -453,12 +450,6 @@
    6.14  		FD99B9490DD52EDC00FB1D6B /* SDL_audiomem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_audiomem.h; sourceTree = "<group>"; };
    6.15  		FD99B94A0DD52EDC00FB1D6B /* SDL_audiotypecvt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_audiotypecvt.c; sourceTree = "<group>"; };
    6.16  		FD99B94B0DD52EDC00FB1D6B /* SDL_mixer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_mixer.c; sourceTree = "<group>"; };
    6.17 -		FD99B94C0DD52EDC00FB1D6B /* SDL_mixer_m68k.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_mixer_m68k.c; sourceTree = "<group>"; };
    6.18 -		FD99B94D0DD52EDC00FB1D6B /* SDL_mixer_m68k.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_mixer_m68k.h; sourceTree = "<group>"; };
    6.19 -		FD99B94E0DD52EDC00FB1D6B /* SDL_mixer_MMX.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_mixer_MMX.c; sourceTree = "<group>"; };
    6.20 -		FD99B94F0DD52EDC00FB1D6B /* SDL_mixer_MMX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_mixer_MMX.h; sourceTree = "<group>"; };
    6.21 -		FD99B9500DD52EDC00FB1D6B /* SDL_mixer_MMX_VC.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_mixer_MMX_VC.c; sourceTree = "<group>"; };
    6.22 -		FD99B9510DD52EDC00FB1D6B /* SDL_mixer_MMX_VC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_mixer_MMX_VC.h; sourceTree = "<group>"; };
    6.23  		FD99B9520DD52EDC00FB1D6B /* SDL_sysaudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysaudio.h; sourceTree = "<group>"; };
    6.24  		FD99B9530DD52EDC00FB1D6B /* SDL_wave.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_wave.c; sourceTree = "<group>"; };
    6.25  		FD99B9540DD52EDC00FB1D6B /* SDL_wave.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_wave.h; sourceTree = "<group>"; };
    6.26 @@ -997,12 +988,6 @@
    6.27  				FD99B9490DD52EDC00FB1D6B /* SDL_audiomem.h */,
    6.28  				FD99B94A0DD52EDC00FB1D6B /* SDL_audiotypecvt.c */,
    6.29  				FD99B94B0DD52EDC00FB1D6B /* SDL_mixer.c */,
    6.30 -				FD99B94C0DD52EDC00FB1D6B /* SDL_mixer_m68k.c */,
    6.31 -				FD99B94D0DD52EDC00FB1D6B /* SDL_mixer_m68k.h */,
    6.32 -				FD99B94E0DD52EDC00FB1D6B /* SDL_mixer_MMX.c */,
    6.33 -				FD99B94F0DD52EDC00FB1D6B /* SDL_mixer_MMX.h */,
    6.34 -				FD99B9500DD52EDC00FB1D6B /* SDL_mixer_MMX_VC.c */,
    6.35 -				FD99B9510DD52EDC00FB1D6B /* SDL_mixer_MMX_VC.h */,
    6.36  				FD99B9520DD52EDC00FB1D6B /* SDL_sysaudio.h */,
    6.37  				FD99B9530DD52EDC00FB1D6B /* SDL_wave.c */,
    6.38  				FD99B9540DD52EDC00FB1D6B /* SDL_wave.h */,
    6.39 @@ -1404,9 +1389,6 @@
    6.40  				FD6526680DE8FCDD002AD96B /* SDL_audiocvt.c in Sources */,
    6.41  				FD65266A0DE8FCDD002AD96B /* SDL_audiotypecvt.c in Sources */,
    6.42  				FD65266B0DE8FCDD002AD96B /* SDL_mixer.c in Sources */,
    6.43 -				FD65266C0DE8FCDD002AD96B /* SDL_mixer_m68k.c in Sources */,
    6.44 -				FD65266D0DE8FCDD002AD96B /* SDL_mixer_MMX.c in Sources */,
    6.45 -				FD65266E0DE8FCDD002AD96B /* SDL_mixer_MMX_VC.c in Sources */,
    6.46  				FD65266F0DE8FCDD002AD96B /* SDL_wave.c in Sources */,
    6.47  				FD6526700DE8FCDD002AD96B /* SDL_cpuinfo.c in Sources */,
    6.48  				FD6526710DE8FCDD002AD96B /* SDL_events.c in Sources */,
     7.1 --- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj	Fri Apr 08 13:03:26 2011 -0700
     7.2 +++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj	Fri Apr 08 13:16:33 2011 -0700
     7.3 @@ -166,12 +166,6 @@
     7.4  		04BD002B12E6671800899322 /* SDL_audiomem.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB912E6671700899322 /* SDL_audiomem.h */; };
     7.5  		04BD002C12E6671800899322 /* SDL_audiotypecvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBA12E6671700899322 /* SDL_audiotypecvt.c */; };
     7.6  		04BD002D12E6671800899322 /* SDL_mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBB12E6671700899322 /* SDL_mixer.c */; };
     7.7 -		04BD002E12E6671800899322 /* SDL_mixer_m68k.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBC12E6671700899322 /* SDL_mixer_m68k.c */; };
     7.8 -		04BD002F12E6671800899322 /* SDL_mixer_m68k.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDBD12E6671700899322 /* SDL_mixer_m68k.h */; };
     7.9 -		04BD003012E6671800899322 /* SDL_mixer_MMX.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBE12E6671700899322 /* SDL_mixer_MMX.c */; };
    7.10 -		04BD003112E6671800899322 /* SDL_mixer_MMX.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDBF12E6671700899322 /* SDL_mixer_MMX.h */; };
    7.11 -		04BD003212E6671800899322 /* SDL_mixer_MMX_VC.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDC012E6671700899322 /* SDL_mixer_MMX_VC.c */; };
    7.12 -		04BD003312E6671800899322 /* SDL_mixer_MMX_VC.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDC112E6671700899322 /* SDL_mixer_MMX_VC.h */; };
    7.13  		04BD003412E6671800899322 /* SDL_sysaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDC212E6671700899322 /* SDL_sysaudio.h */; };
    7.14  		04BD003512E6671800899322 /* SDL_wave.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDC312E6671700899322 /* SDL_wave.c */; };
    7.15  		04BD003612E6671800899322 /* SDL_wave.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDC412E6671700899322 /* SDL_wave.h */; };
    7.16 @@ -330,12 +324,6 @@
    7.17  		04BD024712E6671800899322 /* SDL_audiomem.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB912E6671700899322 /* SDL_audiomem.h */; };
    7.18  		04BD024812E6671800899322 /* SDL_audiotypecvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBA12E6671700899322 /* SDL_audiotypecvt.c */; };
    7.19  		04BD024912E6671800899322 /* SDL_mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBB12E6671700899322 /* SDL_mixer.c */; };
    7.20 -		04BD024A12E6671800899322 /* SDL_mixer_m68k.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBC12E6671700899322 /* SDL_mixer_m68k.c */; };
    7.21 -		04BD024B12E6671800899322 /* SDL_mixer_m68k.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDBD12E6671700899322 /* SDL_mixer_m68k.h */; };
    7.22 -		04BD024C12E6671800899322 /* SDL_mixer_MMX.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBE12E6671700899322 /* SDL_mixer_MMX.c */; };
    7.23 -		04BD024D12E6671800899322 /* SDL_mixer_MMX.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDBF12E6671700899322 /* SDL_mixer_MMX.h */; };
    7.24 -		04BD024E12E6671800899322 /* SDL_mixer_MMX_VC.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDC012E6671700899322 /* SDL_mixer_MMX_VC.c */; };
    7.25 -		04BD024F12E6671800899322 /* SDL_mixer_MMX_VC.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDC112E6671700899322 /* SDL_mixer_MMX_VC.h */; };
    7.26  		04BD025012E6671800899322 /* SDL_sysaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDC212E6671700899322 /* SDL_sysaudio.h */; };
    7.27  		04BD025112E6671800899322 /* SDL_wave.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDC312E6671700899322 /* SDL_wave.c */; };
    7.28  		04BD025212E6671800899322 /* SDL_wave.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDC412E6671700899322 /* SDL_wave.h */; };
    7.29 @@ -666,12 +654,6 @@
    7.30  		04BDFDB912E6671700899322 /* SDL_audiomem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_audiomem.h; sourceTree = "<group>"; };
    7.31  		04BDFDBA12E6671700899322 /* SDL_audiotypecvt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_audiotypecvt.c; sourceTree = "<group>"; };
    7.32  		04BDFDBB12E6671700899322 /* SDL_mixer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_mixer.c; sourceTree = "<group>"; };
    7.33 -		04BDFDBC12E6671700899322 /* SDL_mixer_m68k.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_mixer_m68k.c; sourceTree = "<group>"; };
    7.34 -		04BDFDBD12E6671700899322 /* SDL_mixer_m68k.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_mixer_m68k.h; sourceTree = "<group>"; };
    7.35 -		04BDFDBE12E6671700899322 /* SDL_mixer_MMX.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_mixer_MMX.c; sourceTree = "<group>"; };
    7.36 -		04BDFDBF12E6671700899322 /* SDL_mixer_MMX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_mixer_MMX.h; sourceTree = "<group>"; };
    7.37 -		04BDFDC012E6671700899322 /* SDL_mixer_MMX_VC.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_mixer_MMX_VC.c; sourceTree = "<group>"; };
    7.38 -		04BDFDC112E6671700899322 /* SDL_mixer_MMX_VC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_mixer_MMX_VC.h; sourceTree = "<group>"; };
    7.39  		04BDFDC212E6671700899322 /* SDL_sysaudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysaudio.h; sourceTree = "<group>"; };
    7.40  		04BDFDC312E6671700899322 /* SDL_wave.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_wave.c; sourceTree = "<group>"; };
    7.41  		04BDFDC412E6671700899322 /* SDL_wave.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_wave.h; sourceTree = "<group>"; };
    7.42 @@ -1166,12 +1148,6 @@
    7.43  				04BDFDB912E6671700899322 /* SDL_audiomem.h */,
    7.44  				04BDFDBA12E6671700899322 /* SDL_audiotypecvt.c */,
    7.45  				04BDFDBB12E6671700899322 /* SDL_mixer.c */,
    7.46 -				04BDFDBC12E6671700899322 /* SDL_mixer_m68k.c */,
    7.47 -				04BDFDBD12E6671700899322 /* SDL_mixer_m68k.h */,
    7.48 -				04BDFDBE12E6671700899322 /* SDL_mixer_MMX.c */,
    7.49 -				04BDFDBF12E6671700899322 /* SDL_mixer_MMX.h */,
    7.50 -				04BDFDC012E6671700899322 /* SDL_mixer_MMX_VC.c */,
    7.51 -				04BDFDC112E6671700899322 /* SDL_mixer_MMX_VC.h */,
    7.52  				04BDFDC212E6671700899322 /* SDL_sysaudio.h */,
    7.53  				04BDFDC312E6671700899322 /* SDL_wave.c */,
    7.54  				04BDFDC412E6671700899322 /* SDL_wave.h */,
    7.55 @@ -1681,9 +1657,6 @@
    7.56  				04BD002712E6671800899322 /* SDL_audio_c.h in Headers */,
    7.57  				04BD002A12E6671800899322 /* SDL_audiodev_c.h in Headers */,
    7.58  				04BD002B12E6671800899322 /* SDL_audiomem.h in Headers */,
    7.59 -				04BD002F12E6671800899322 /* SDL_mixer_m68k.h in Headers */,
    7.60 -				04BD003112E6671800899322 /* SDL_mixer_MMX.h in Headers */,
    7.61 -				04BD003312E6671800899322 /* SDL_mixer_MMX_VC.h in Headers */,
    7.62  				04BD003412E6671800899322 /* SDL_sysaudio.h in Headers */,
    7.63  				04BD003612E6671800899322 /* SDL_wave.h in Headers */,
    7.64  				04BD004212E6671800899322 /* blank_cursor.h in Headers */,
    7.65 @@ -1796,9 +1769,6 @@
    7.66  				04BD024312E6671800899322 /* SDL_audio_c.h in Headers */,
    7.67  				04BD024612E6671800899322 /* SDL_audiodev_c.h in Headers */,
    7.68  				04BD024712E6671800899322 /* SDL_audiomem.h in Headers */,
    7.69 -				04BD024B12E6671800899322 /* SDL_mixer_m68k.h in Headers */,
    7.70 -				04BD024D12E6671800899322 /* SDL_mixer_MMX.h in Headers */,
    7.71 -				04BD024F12E6671800899322 /* SDL_mixer_MMX_VC.h in Headers */,
    7.72  				04BD025012E6671800899322 /* SDL_sysaudio.h in Headers */,
    7.73  				04BD025212E6671800899322 /* SDL_wave.h in Headers */,
    7.74  				04BD025D12E6671800899322 /* blank_cursor.h in Headers */,
    7.75 @@ -2111,9 +2081,6 @@
    7.76  				04BD002912E6671800899322 /* SDL_audiodev.c in Sources */,
    7.77  				04BD002C12E6671800899322 /* SDL_audiotypecvt.c in Sources */,
    7.78  				04BD002D12E6671800899322 /* SDL_mixer.c in Sources */,
    7.79 -				04BD002E12E6671800899322 /* SDL_mixer_m68k.c in Sources */,
    7.80 -				04BD003012E6671800899322 /* SDL_mixer_MMX.c in Sources */,
    7.81 -				04BD003212E6671800899322 /* SDL_mixer_MMX_VC.c in Sources */,
    7.82  				04BD003512E6671800899322 /* SDL_wave.c in Sources */,
    7.83  				04BD004112E6671800899322 /* SDL_cpuinfo.c in Sources */,
    7.84  				04BD004812E6671800899322 /* SDL_clipboardevents.c in Sources */,
    7.85 @@ -2226,9 +2193,6 @@
    7.86  				04BD024512E6671800899322 /* SDL_audiodev.c in Sources */,
    7.87  				04BD024812E6671800899322 /* SDL_audiotypecvt.c in Sources */,
    7.88  				04BD024912E6671800899322 /* SDL_mixer.c in Sources */,
    7.89 -				04BD024A12E6671800899322 /* SDL_mixer_m68k.c in Sources */,
    7.90 -				04BD024C12E6671800899322 /* SDL_mixer_MMX.c in Sources */,
    7.91 -				04BD024E12E6671800899322 /* SDL_mixer_MMX_VC.c in Sources */,
    7.92  				04BD025112E6671800899322 /* SDL_wave.c in Sources */,
    7.93  				04BD025C12E6671800899322 /* SDL_cpuinfo.c in Sources */,
    7.94  				04BD026312E6671800899322 /* SDL_clipboardevents.c in Sources */,
     8.1 --- a/src/audio/SDL_mixer.c	Fri Apr 08 13:03:26 2011 -0700
     8.2 +++ b/src/audio/SDL_mixer.c	Fri Apr 08 13:16:33 2011 -0700
     8.3 @@ -26,9 +26,6 @@
     8.4  #include "SDL_timer.h"
     8.5  #include "SDL_audio.h"
     8.6  #include "SDL_sysaudio.h"
     8.7 -#include "SDL_mixer_MMX.h"
     8.8 -#include "SDL_mixer_MMX_VC.h"
     8.9 -#include "SDL_mixer_m68k.h"
    8.10  
    8.11  /* This table is used to add two sound values together and pin
    8.12   * the value to avoid overflow.  (used with permission from ARDI)
    8.13 @@ -121,95 +118,55 @@
    8.14  
    8.15      case AUDIO_S8:
    8.16          {
    8.17 -#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */
    8.18 -#if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
    8.19 -            if (SDL_HasMMX()) {
    8.20 -                SDL_MixAudio_MMX_S8((char *) dst, (char *) src,
    8.21 -                                    (unsigned int) len, (int) volume);
    8.22 -            } else
    8.23 -#elif ((defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)) && defined(SDL_ASSEMBLY_ROUTINES)
    8.24 -            if (SDL_HasMMX()) {
    8.25 -                SDL_MixAudio_MMX_S8_VC((char *) dst, (char *) src,
    8.26 -                                       (unsigned int) len, (int) volume);
    8.27 -            } else
    8.28 -#endif
    8.29 -#endif
    8.30 -#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
    8.31 -                SDL_MixAudio_m68k_S8((char *) dst, (char *) src,
    8.32 -                                     (unsigned long) len, (long) volume);
    8.33 -#else
    8.34 -            {
    8.35 -                Sint8 *dst8, *src8;
    8.36 -                Sint8 src_sample;
    8.37 -                int dst_sample;
    8.38 -                const int max_audioval = ((1 << (8 - 1)) - 1);
    8.39 -                const int min_audioval = -(1 << (8 - 1));
    8.40 +            Sint8 *dst8, *src8;
    8.41 +            Sint8 src_sample;
    8.42 +            int dst_sample;
    8.43 +            const int max_audioval = ((1 << (8 - 1)) - 1);
    8.44 +            const int min_audioval = -(1 << (8 - 1));
    8.45  
    8.46 -                src8 = (Sint8 *) src;
    8.47 -                dst8 = (Sint8 *) dst;
    8.48 -                while (len--) {
    8.49 -                    src_sample = *src8;
    8.50 -                    ADJUST_VOLUME(src_sample, volume);
    8.51 -                    dst_sample = *dst8 + src_sample;
    8.52 -                    if (dst_sample > max_audioval) {
    8.53 -                        *dst8 = max_audioval;
    8.54 -                    } else if (dst_sample < min_audioval) {
    8.55 -                        *dst8 = min_audioval;
    8.56 -                    } else {
    8.57 -                        *dst8 = dst_sample;
    8.58 -                    }
    8.59 -                    ++dst8;
    8.60 -                    ++src8;
    8.61 +            src8 = (Sint8 *) src;
    8.62 +            dst8 = (Sint8 *) dst;
    8.63 +            while (len--) {
    8.64 +                src_sample = *src8;
    8.65 +                ADJUST_VOLUME(src_sample, volume);
    8.66 +                dst_sample = *dst8 + src_sample;
    8.67 +                if (dst_sample > max_audioval) {
    8.68 +                    *dst8 = max_audioval;
    8.69 +                } else if (dst_sample < min_audioval) {
    8.70 +                    *dst8 = min_audioval;
    8.71 +                } else {
    8.72 +                    *dst8 = dst_sample;
    8.73                  }
    8.74 +                ++dst8;
    8.75 +                ++src8;
    8.76              }
    8.77 -#endif
    8.78          }
    8.79          break;
    8.80  
    8.81      case AUDIO_S16LSB:
    8.82          {
    8.83 -#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */
    8.84 -#if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
    8.85 -            if (SDL_HasMMX()) {
    8.86 -                SDL_MixAudio_MMX_S16((char *) dst, (char *) src,
    8.87 -                                     (unsigned int) len, (int) volume);
    8.88 -            } else
    8.89 -#elif ((defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)) && defined(SDL_ASSEMBLY_ROUTINES)
    8.90 -            if (SDL_HasMMX()) {
    8.91 -                SDL_MixAudio_MMX_S16_VC((char *) dst, (char *) src,
    8.92 -                                        (unsigned int) len, (int) volume);
    8.93 -            } else
    8.94 -#endif
    8.95 -#endif
    8.96 -#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
    8.97 -                SDL_MixAudio_m68k_S16LSB((short *) dst, (short *) src,
    8.98 -                                         (unsigned long) len, (long) volume);
    8.99 -#else
   8.100 -            {
   8.101 -                Sint16 src1, src2;
   8.102 -                int dst_sample;
   8.103 -                const int max_audioval = ((1 << (16 - 1)) - 1);
   8.104 -                const int min_audioval = -(1 << (16 - 1));
   8.105 +            Sint16 src1, src2;
   8.106 +            int dst_sample;
   8.107 +            const int max_audioval = ((1 << (16 - 1)) - 1);
   8.108 +            const int min_audioval = -(1 << (16 - 1));
   8.109  
   8.110 -                len /= 2;
   8.111 -                while (len--) {
   8.112 -                    src1 = ((src[1]) << 8 | src[0]);
   8.113 -                    ADJUST_VOLUME(src1, volume);
   8.114 -                    src2 = ((dst[1]) << 8 | dst[0]);
   8.115 -                    src += 2;
   8.116 -                    dst_sample = src1 + src2;
   8.117 -                    if (dst_sample > max_audioval) {
   8.118 -                        dst_sample = max_audioval;
   8.119 -                    } else if (dst_sample < min_audioval) {
   8.120 -                        dst_sample = min_audioval;
   8.121 -                    }
   8.122 -                    dst[0] = dst_sample & 0xFF;
   8.123 -                    dst_sample >>= 8;
   8.124 -                    dst[1] = dst_sample & 0xFF;
   8.125 -                    dst += 2;
   8.126 +            len /= 2;
   8.127 +            while (len--) {
   8.128 +                src1 = ((src[1]) << 8 | src[0]);
   8.129 +                ADJUST_VOLUME(src1, volume);
   8.130 +                src2 = ((dst[1]) << 8 | dst[0]);
   8.131 +                src += 2;
   8.132 +                dst_sample = src1 + src2;
   8.133 +                if (dst_sample > max_audioval) {
   8.134 +                    dst_sample = max_audioval;
   8.135 +                } else if (dst_sample < min_audioval) {
   8.136 +                    dst_sample = min_audioval;
   8.137                  }
   8.138 +                dst[0] = dst_sample & 0xFF;
   8.139 +                dst_sample >>= 8;
   8.140 +                dst[1] = dst_sample & 0xFF;
   8.141 +                dst += 2;
   8.142              }
   8.143 -#endif
   8.144          }
   8.145          break;
   8.146  
     9.1 --- a/src/audio/SDL_mixer_MMX.c	Fri Apr 08 13:03:26 2011 -0700
     9.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.3 @@ -1,124 +0,0 @@
     9.4 -/*
     9.5 -    SDL - Simple DirectMedia Layer
     9.6 -    Copyright (C) 1997-2011 Sam Lantinga
     9.7 -
     9.8 -    This library is free software; you can redistribute it and/or
     9.9 -    modify it under the terms of the GNU Lesser General Public
    9.10 -    License as published by the Free Software Foundation; either
    9.11 -    version 2.1 of the License, or (at your option) any later version.
    9.12 -
    9.13 -    This library is distributed in the hope that it will be useful,
    9.14 -    but WITHOUT ANY WARRANTY; without even the implied warranty of
    9.15 -    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    9.16 -    Lesser General Public License for more details.
    9.17 -
    9.18 -    You should have received a copy of the GNU Lesser General Public
    9.19 -    License along with this library; if not, write to the Free Software
    9.20 -    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    9.21 -
    9.22 -    Sam Lantinga
    9.23 -    slouken@libsdl.org
    9.24 -*/
    9.25 -#include "SDL_config.h"
    9.26 -
    9.27 -/*
    9.28 -    MMX assembler version of SDL_MixAudio for signed little endian 16 bit samples and signed 8 bit samples
    9.29 -    Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr)
    9.30 -    This code is licensed under the LGPL (see COPYING for details)
    9.31 - 
    9.32 -    Assumes buffer size in bytes is a multiple of 16
    9.33 -    Assumes SDL_MIX_MAXVOLUME = 128
    9.34 -*/
    9.35 -
    9.36 -
    9.37 -/***********************************************
    9.38 -*   Mixing for 16 bit signed buffers
    9.39 -***********************************************/
    9.40 -
    9.41 -#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */
    9.42 -#if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
    9.43 -void
    9.44 -SDL_MixAudio_MMX_S16(char *dst, char *src, unsigned int size, int volume)
    9.45 -{
    9.46 -    __asm__ __volatile__("	movl %3,%%eax\n"        /* eax = volume */
    9.47 -                         "	movl %2,%%edx\n"        /* edx = size */
    9.48 -                         "	shrl $4,%%edx\n"        /* process 16 bytes per iteration = 8 samples */
    9.49 -                         "	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 */
    9.50 -                         ".align 8\n" "	.mixloopS16:\n" "	movq (%1),%%mm1\n"      /* mm1 = a|b|c|d */
    9.51 -                         "	movq %%mm1,%%mm2\n"     /* mm2 = a|b|c|d */
    9.52 -                         "	movq 8(%1),%%mm4\n"     /* mm4 = e|f|g|h */
    9.53 -                         /* pré charger le buffer dst dans mm7 */
    9.54 -                         "	movq (%0),%%mm7\n"      /* mm7 = dst[0] */
    9.55 -                         /* multiplier par le volume */
    9.56 -                         "	pmullw %%mm0,%%mm1\n"   /* mm1 = l(a*v)|l(b*v)|l(c*v)|l(d*v) */
    9.57 -                         "	pmulhw %%mm0,%%mm2\n"   /* mm2 = h(a*v)|h(b*v)|h(c*v)|h(d*v) */
    9.58 -                         "	movq %%mm4,%%mm5\n"     /* mm5 = e|f|g|h */
    9.59 -                         "	pmullw %%mm0,%%mm4\n"   /* mm4 = l(e*v)|l(f*v)|l(g*v)|l(h*v) */
    9.60 -                         "	pmulhw %%mm0,%%mm5\n"   /* mm5 = h(e*v)|h(f*v)|h(g*v)|h(h*v) */
    9.61 -                         "	movq %%mm1,%%mm3\n"     /* mm3 = l(a*v)|l(b*v)|l(c*v)|l(d*v) */
    9.62 -                         "	punpckhwd %%mm2,%%mm1\n"        /* mm1 = a*v|b*v */
    9.63 -                         "	movq %%mm4,%%mm6\n"     /* mm6 = l(e*v)|l(f*v)|l(g*v)|l(h*v) */
    9.64 -                         "	punpcklwd %%mm2,%%mm3\n"        /* mm3 = c*v|d*v */
    9.65 -                         "	punpckhwd %%mm5,%%mm4\n"        /* mm4 = e*f|f*v */
    9.66 -                         "	punpcklwd %%mm5,%%mm6\n"        /* mm6 = g*v|h*v */
    9.67 -                         /* pré charger le buffer dst dans mm5 */
    9.68 -                         "	movq 8(%0),%%mm5\n"     /* mm5 = dst[1] */
    9.69 -                         /* diviser par 128 */
    9.70 -                         "	psrad $7,%%mm1\n"       /* mm1 = a*v/128|b*v/128 , 128 = SDL_MIX_MAXVOLUME */
    9.71 -                         "	add $16,%1\n" "	psrad $7,%%mm3\n"       /* mm3 = c*v/128|d*v/128 */
    9.72 -                         "	psrad $7,%%mm4\n"       /* mm4 = e*v/128|f*v/128 */
    9.73 -                         /* mm1 = le sample avec le volume modifié */
    9.74 -                         "	packssdw %%mm1,%%mm3\n" /* mm3 = s(a*v|b*v|c*v|d*v) */
    9.75 -                         "	psrad $7,%%mm6\n"       /* mm6= g*v/128|h*v/128 */
    9.76 -                         "	paddsw %%mm7,%%mm3\n"   /* mm3 = adjust_volume(src)+dst */
    9.77 -                         /* mm4 = le sample avec le volume modifié */
    9.78 -                         "	packssdw %%mm4,%%mm6\n" /* mm6 = s(e*v|f*v|g*v|h*v) */
    9.79 -                         "	movq %%mm3,(%0)\n" "	paddsw %%mm5,%%mm6\n"   /* mm6 = adjust_volume(src)+dst */
    9.80 -                         "	movq %%mm6,8(%0)\n"
    9.81 -                         "	add $16,%0\n"
    9.82 -                         "	dec %%edx\n"
    9.83 -                         "	jnz .mixloopS16\n"
    9.84 -                         "	emms\n"
    9.85 -                         ".endS16:\n"::"r"(dst), "r"(src),
    9.86 -                         "m"(size), "m"(volume):"eax", "edx", "memory");
    9.87 -}
    9.88 -
    9.89 -
    9.90 -
    9.91 -/*////////////////////////////////////////////// */
    9.92 -/* Mixing for 8 bit signed buffers */
    9.93 -/*////////////////////////////////////////////// */
    9.94 -
    9.95 -void
    9.96 -SDL_MixAudio_MMX_S8(char *dst, char *src, unsigned int size, int volume)
    9.97 -{
    9.98 -    __asm__ __volatile__("	movl %3,%%eax\n"        /* eax = volume */
    9.99 -                         "	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 */
   9.100 -                         "	shr $3,%%edx\n" /* process 8 bytes per iteration = 8 samples */
   9.101 -                         "	cmp $0,%%edx\n" "	je .endS8\n" ".align 8\n" "	.mixloopS8:\n" "	pxor %%mm2,%%mm2\n"     /* mm2 = 0 */
   9.102 -                         "	movq (%1),%%mm1\n"      /* mm1 = a|b|c|d|e|f|g|h */
   9.103 -                         "	movq %%mm1,%%mm3\n"     /* mm3 = a|b|c|d|e|f|g|h */
   9.104 -                         /* on va faire le "sign extension" en faisant un cmp avec 0 qui retourne 1 si <0, 0 si >0 */
   9.105 -                         "	pcmpgtb %%mm1,%%mm2\n"  /* mm2 = 11111111|00000000|00000000.... */
   9.106 -                         "	punpckhbw %%mm2,%%mm1\n"        /* mm1 = 0|a|0|b|0|c|0|d */
   9.107 -                         "	punpcklbw %%mm2,%%mm3\n"        /* mm3 = 0|e|0|f|0|g|0|h */
   9.108 -                         "	movq (%0),%%mm2\n"      /* mm2 = destination */
   9.109 -                         "	pmullw %%mm0,%%mm1\n"   /* mm1 = v*a|v*b|v*c|v*d */
   9.110 -                         "	add $8,%1\n" "	pmullw %%mm0,%%mm3\n"   /* mm3 = v*e|v*f|v*g|v*h */
   9.111 -                         "	psraw $7,%%mm1\n"       /* mm1 = v*a/128|v*b/128|v*c/128|v*d/128  */
   9.112 -                         "	psraw $7,%%mm3\n"       /* mm3 = v*e/128|v*f/128|v*g/128|v*h/128 */
   9.113 -                         "	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 */
   9.114 -                         "	paddsb %%mm2,%%mm3\n"   /* add to destination buffer */
   9.115 -                         "	movq %%mm3,(%0)\n"      /* store back to ram */
   9.116 -                         "	add $8,%0\n"
   9.117 -                         "	dec %%edx\n"
   9.118 -                         "	jnz .mixloopS8\n"
   9.119 -                         ".endS8:\n"
   9.120 -                         "	emms\n"::"r"(dst), "r"(src), "m"(size),
   9.121 -                         "m"(volume):"eax", "edx", "memory");
   9.122 -}
   9.123 -#endif
   9.124 -
   9.125 -#endif /* SDL_BUGGY_MMX_MIXERS */
   9.126 -
   9.127 -/* vi: set ts=4 sw=4 expandtab: */
    10.1 --- a/src/audio/SDL_mixer_MMX.h	Fri Apr 08 13:03:26 2011 -0700
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,17 +0,0 @@
    10.4 -/*
    10.5 -    headers for MMX assembler version of SDL_MixAudio
    10.6 -    Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr)
    10.7 -    This code is licensed under the LGPL (see COPYING for details)
    10.8 -
    10.9 -    Assumes buffer size in bytes is a multiple of 16
   10.10 -    Assumes SDL_MIX_MAXVOLUME = 128
   10.11 -*/
   10.12 -#include "SDL_config.h"
   10.13 -
   10.14 -#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */
   10.15 -#if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
   10.16 -void SDL_MixAudio_MMX_S16(char *, char *, unsigned int, int);
   10.17 -void SDL_MixAudio_MMX_S8(char *, char *, unsigned int, int);
   10.18 -#endif
   10.19 -#endif /* SDL_BUGGY_MMX_MIXERS */
   10.20 -/* vi: set ts=4 sw=4 expandtab: */
    11.1 --- a/src/audio/SDL_mixer_MMX_VC.c	Fri Apr 08 13:03:26 2011 -0700
    11.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.3 @@ -1,190 +0,0 @@
    11.4 -/*
    11.5 -    SDL - Simple DirectMedia Layer
    11.6 -    Copyright (C) 1997-2011 Sam Lantinga
    11.7 -
    11.8 -    This library is free software; you can redistribute it and/or
    11.9 -    modify it under the terms of the GNU Lesser General Public
   11.10 -    License as published by the Free Software Foundation; either
   11.11 -    version 2.1 of the License, or (at your option) any later version.
   11.12 -
   11.13 -    This library is distributed in the hope that it will be useful,
   11.14 -    but WITHOUT ANY WARRANTY; without even the implied warranty of
   11.15 -    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   11.16 -    Lesser General Public License for more details.
   11.17 -
   11.18 -    You should have received a copy of the GNU Lesser General Public
   11.19 -    License along with this library; if not, write to the Free Software
   11.20 -    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   11.21 -
   11.22 -    Sam Lantinga
   11.23 -    slouken@libsdl.org
   11.24 -*/
   11.25 -#include "SDL_config.h"
   11.26 -
   11.27 -#include "SDL_mixer_MMX_VC.h"
   11.28 -
   11.29 -#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */
   11.30 -#if ((defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)) && defined(SDL_ASSEMBLY_ROUTINES)
   11.31 -// MMX assembler version of SDL_MixAudio for signed little endian 16 bit samples and signed 8 bit samples
   11.32 -// Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr)
   11.33 -// Converted to Intel ASM notation by Cth
   11.34 -// This code is licensed under the LGPL (see COPYING for details)
   11.35 -// 
   11.36 -// Assumes buffer size in bytes is a multiple of 16
   11.37 -// Assumes SDL_MIX_MAXVOLUME = 128
   11.38 -
   11.39 -
   11.40 -////////////////////////////////////////////////
   11.41 -// Mixing for 16 bit signed buffers
   11.42 -////////////////////////////////////////////////
   11.43 -
   11.44 -void
   11.45 -SDL_MixAudio_MMX_S16_VC(char *dst, char *src, unsigned int nSize, int volume)
   11.46 -{
   11.47 -    /* *INDENT-OFF* */
   11.48 -	__asm
   11.49 -	{
   11.50 -
   11.51 -		push	edi
   11.52 -		push	esi
   11.53 -		push	ebx
   11.54 -		
   11.55 -		mov		edi, dst		// edi = dst
   11.56 -		mov		esi, src		// esi = src
   11.57 -		mov		eax, volume		// eax = volume
   11.58 -		mov		ebx, nSize		// ebx = size
   11.59 -		shr		ebx, 4			// process 16 bytes per iteration = 8 samples
   11.60 -		jz		endS16
   11.61 -		
   11.62 -		pxor	mm0, mm0
   11.63 -		movd	mm0, eax		//%%eax,%%mm0
   11.64 -		movq	mm1, mm0		//%%mm0,%%mm1
   11.65 -		psllq	mm0, 16			//$16,%%mm0
   11.66 -		por		mm0, mm1		//%%mm1,%%mm0
   11.67 -		psllq	mm0, 16			//$16,%%mm0
   11.68 -		por		mm0, mm1		//%%mm1,%%mm0
   11.69 -		psllq	mm0, 16			//$16,%%mm0
   11.70 -		por		mm0, mm1		//%%mm1,%%mm0			// mm0 = vol|vol|vol|vol
   11.71 -
   11.72 -		#ifndef __WATCOMC__
   11.73 -		align	16
   11.74 -		#endif
   11.75 -mixloopS16:
   11.76 -		movq	mm1, [esi]		//(%%esi),%%mm1\n" // mm1 = a|b|c|d
   11.77 -		movq	mm2, mm1		//%%mm1,%%mm2\n" // mm2 = a|b|c|d
   11.78 -		movq	mm4, [esi + 8]	//8(%%esi),%%mm4\n" // mm4 = e|f|g|h
   11.79 -		// pre charger le buffer dst dans mm7
   11.80 -		movq	mm7, [edi]		//(%%edi),%%mm7\n" // mm7 = dst[0]"
   11.81 -		// multiplier par le volume
   11.82 -		pmullw	mm1, mm0		//%%mm0,%%mm1\n" // mm1 = l(a*v)|l(b*v)|l(c*v)|l(d*v)
   11.83 -		pmulhw	mm2, mm0		//%%mm0,%%mm2\n" // mm2 = h(a*v)|h(b*v)|h(c*v)|h(d*v)
   11.84 -		movq	mm5, mm4		//%%mm4,%%mm5\n" // mm5 = e|f|g|h
   11.85 -		pmullw	mm4, mm0		//%%mm0,%%mm4\n" // mm4 = l(e*v)|l(f*v)|l(g*v)|l(h*v)
   11.86 -		pmulhw	mm5, mm0		//%%mm0,%%mm5\n" // mm5 = h(e*v)|h(f*v)|h(g*v)|h(h*v)
   11.87 -		movq	mm3, mm1		//%%mm1,%%mm3\n" // mm3 = l(a*v)|l(b*v)|l(c*v)|l(d*v)
   11.88 -		punpckhwd	mm1, mm2	//%%mm2,%%mm1\n" // mm1 = a*v|b*v
   11.89 -		movq		mm6, mm4	//%%mm4,%%mm6\n" // mm6 = l(e*v)|l(f*v)|l(g*v)|l(h*v)
   11.90 -		punpcklwd	mm3, mm2	//%%mm2,%%mm3\n" // mm3 = c*v|d*v
   11.91 -		punpckhwd	mm4, mm5	//%%mm5,%%mm4\n" // mm4 = e*f|f*v
   11.92 -		punpcklwd	mm6, mm5	//%%mm5,%%mm6\n" // mm6 = g*v|h*v
   11.93 -		// pre charger le buffer dst dans mm5
   11.94 -		movq	mm5, [edi + 8]	//8(%%edi),%%mm5\n" // mm5 = dst[1]
   11.95 -		// diviser par 128
   11.96 -		psrad	mm1, 7			//$7,%%mm1\n" // mm1 = a*v/128|b*v/128 , 128 = SDL_MIX_MAXVOLUME
   11.97 -		add		esi, 16			//$16,%%esi\n"
   11.98 -		psrad	mm3, 7			//$7,%%mm3\n" // mm3 = c*v/128|d*v/128
   11.99 -		psrad	mm4, 7			//$7,%%mm4\n" // mm4 = e*v/128|f*v/128
  11.100 -		// mm1 = le sample avec le volume modifie
  11.101 -		packssdw	mm3, mm1	//%%mm1,%%mm3\n" // mm3 = s(a*v|b*v|c*v|d*v)
  11.102 -		psrad	mm6, 7			//$7,%%mm6\n" // mm6= g*v/128|h*v/128
  11.103 -		paddsw	mm3, mm7		//%%mm7,%%mm3\n" // mm3 = adjust_volume(src)+dst
  11.104 -		// mm4 = le sample avec le volume modifie
  11.105 -		packssdw	mm6, mm4	//%%mm4,%%mm6\n" // mm6 = s(e*v|f*v|g*v|h*v)
  11.106 -		movq	[edi], mm3		//%%mm3,(%%edi)\n"
  11.107 -		paddsw	mm6, mm5		//%%mm5,%%mm6\n" // mm6 = adjust_volume(src)+dst
  11.108 -		movq	[edi + 8], mm6	//%%mm6,8(%%edi)\n"
  11.109 -		add		edi, 16			//$16,%%edi\n"
  11.110 -		dec		ebx				//%%ebx\n"
  11.111 -		jnz mixloopS16
  11.112 -
  11.113 -endS16:
  11.114 -		emms
  11.115 -		
  11.116 -		pop		ebx
  11.117 -		pop		esi
  11.118 -		pop		edi
  11.119 -	}
  11.120 -    /* *INDENT-ON* */
  11.121 -}
  11.122 -
  11.123 -////////////////////////////////////////////////
  11.124 -// Mixing for 8 bit signed buffers
  11.125 -////////////////////////////////////////////////
  11.126 -
  11.127 -void
  11.128 -SDL_MixAudio_MMX_S8_VC(char *dst, char *src, unsigned int nSize, int volume)
  11.129 -{
  11.130 -    /* *INDENT-OFF* */
  11.131 -	_asm
  11.132 -	{
  11.133 -
  11.134 -		push	edi
  11.135 -		push	esi
  11.136 -		push	ebx
  11.137 -		
  11.138 -		mov		edi, dst	//movl	%0,%%edi	// edi = dst
  11.139 -		mov		esi, src	//%1,%%esi	// esi = src
  11.140 -		mov		eax, volume	//%3,%%eax	// eax = volume
  11.141 -
  11.142 -		movd	mm0, eax	//%%eax,%%mm0
  11.143 -		movq	mm1, mm0	//%%mm0,%%mm1
  11.144 -		psllq	mm0, 16		//$16,%%mm0
  11.145 -		por		mm0, mm1	//%%mm1,%%mm0
  11.146 -		psllq	mm0, 16		//$16,%%mm0
  11.147 -		por		mm0, mm1	//%%mm1,%%mm0
  11.148 -		psllq	mm0, 16		//$16,%%mm0
  11.149 -		por		mm0, mm1	//%%mm1,%%mm0
  11.150 -		
  11.151 -		mov		ebx, nSize	//%2,%%ebx	// ebx = size
  11.152 -		shr		ebx, 3		//$3,%%ebx	// process 8 bytes per iteration = 8 samples
  11.153 -		cmp		ebx, 0		//$0,%%ebx
  11.154 -		je		endS8
  11.155 -
  11.156 -		#ifndef __WATCOMC__
  11.157 -		align 16
  11.158 -		#endif
  11.159 -mixloopS8:
  11.160 -		pxor	mm2, mm2	//%%mm2,%%mm2		// mm2 = 0
  11.161 -		movq	mm1, [esi]	//(%%esi),%%mm1	// mm1 = a|b|c|d|e|f|g|h
  11.162 -		movq	mm3, mm1	//%%mm1,%%mm3 	// mm3 = a|b|c|d|e|f|g|h
  11.163 -		// on va faire le "sign extension" en faisant un cmp avec 0 qui retourne 1 si <0, 0 si >0
  11.164 -		pcmpgtb		mm2, mm1	//%%mm1,%%mm2	// mm2 = 11111111|00000000|00000000....
  11.165 -		punpckhbw	mm1, mm2	//%%mm2,%%mm1	// mm1 = 0|a|0|b|0|c|0|d
  11.166 -		punpcklbw	mm3, mm2	//%%mm2,%%mm3	// mm3 = 0|e|0|f|0|g|0|h
  11.167 -		movq	mm2, [edi]	//(%%edi),%%mm2	// mm2 = destination
  11.168 -		pmullw	mm1, mm0	//%%mm0,%%mm1	// mm1 = v*a|v*b|v*c|v*d
  11.169 -		add		esi, 8		//$8,%%esi
  11.170 -		pmullw	mm3, mm0	//%%mm0,%%mm3	// mm3 = v*e|v*f|v*g|v*h
  11.171 -		psraw	mm1, 7		//$7,%%mm1		// mm1 = v*a/128|v*b/128|v*c/128|v*d/128 
  11.172 -		psraw	mm3, 7		//$7,%%mm3		// mm3 = v*e/128|v*f/128|v*g/128|v*h/128
  11.173 -		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
  11.174 -		paddsb	mm3, mm2	//%%mm2,%%mm3	// add to destination buffer
  11.175 -		movq	[edi], mm3	//%%mm3,(%%edi)	// store back to ram
  11.176 -		add		edi, 8		//$8,%%edi
  11.177 -		dec		ebx			//%%ebx
  11.178 -		jnz		mixloopS8
  11.179 -		
  11.180 -endS8:
  11.181 -		emms
  11.182 -		
  11.183 -		pop		ebx
  11.184 -		pop		esi
  11.185 -		pop		edi
  11.186 -	}
  11.187 -    /* *INDENT-ON* */
  11.188 -}
  11.189 -
  11.190 -#endif /* SDL_ASSEMBLY_ROUTINES */
  11.191 -#endif /* SDL_BUGGY_MMX_MIXERS */
  11.192 -
  11.193 -/* vi: set ts=4 sw=4 expandtab: */
    12.1 --- a/src/audio/SDL_mixer_MMX_VC.h	Fri Apr 08 13:03:26 2011 -0700
    12.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.3 @@ -1,39 +0,0 @@
    12.4 -/*
    12.5 -    SDL - Simple DirectMedia Layer
    12.6 -    Copyright (C) 1997-2011 Sam Lantinga
    12.7 -
    12.8 -    This library is free software; you can redistribute it and/or
    12.9 -    modify it under the terms of the GNU Lesser General Public
   12.10 -    License as published by the Free Software Foundation; either
   12.11 -    version 2.1 of the License, or (at your option) any later version.
   12.12 -
   12.13 -    This library is distributed in the hope that it will be useful,
   12.14 -    but WITHOUT ANY WARRANTY; without even the implied warranty of
   12.15 -    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   12.16 -    Lesser General Public License for more details.
   12.17 -
   12.18 -    You should have received a copy of the GNU Lesser General Public
   12.19 -    License along with this library; if not, write to the Free Software
   12.20 -    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   12.21 -
   12.22 -    Sam Lantinga
   12.23 -    slouken@libsdl.org
   12.24 -*/
   12.25 -#include "SDL_config.h"
   12.26 -
   12.27 -#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */
   12.28 -#if ((defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)) && defined(SDL_ASSEMBLY_ROUTINES)
   12.29 -/* headers for MMX assembler version of SDL_MixAudio
   12.30 -   Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr)
   12.31 -   Converted to Intel ASM notation by Cth
   12.32 -   This code is licensed under the LGPL (see COPYING for details)
   12.33 -   
   12.34 -   Assumes buffer size in bytes is a multiple of 16
   12.35 -   Assumes SDL_MIX_MAXVOLUME = 128
   12.36 -*/
   12.37 -void SDL_MixAudio_MMX_S16_VC(char *, char *, unsigned int, int);
   12.38 -void SDL_MixAudio_MMX_S8_VC(char *, char *, unsigned int, int);
   12.39 -#endif
   12.40 -#endif /* SDL_BUGGY_MMX_MIXERS */
   12.41 -
   12.42 -/* vi: set ts=4 sw=4 expandtab: */
    13.1 --- a/src/audio/SDL_mixer_m68k.c	Fri Apr 08 13:03:26 2011 -0700
    13.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.3 @@ -1,140 +0,0 @@
    13.4 -/*
    13.5 -    SDL - Simple DirectMedia Layer
    13.6 -    Copyright (C) 1997-2011 Sam Lantinga
    13.7 -
    13.8 -    This library is free software; you can redistribute it and/or
    13.9 -    modify it under the terms of the GNU Lesser General Public
   13.10 -    License as published by the Free Software Foundation; either
   13.11 -    version 2.1 of the License, or (at your option) any later version.
   13.12 -
   13.13 -    This library is distributed in the hope that it will be useful,
   13.14 -    but WITHOUT ANY WARRANTY; without even the implied warranty of
   13.15 -    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   13.16 -    Lesser General Public License for more details.
   13.17 -
   13.18 -    You should have received a copy of the GNU Lesser General Public
   13.19 -    License along with this library; if not, write to the Free Software
   13.20 -    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   13.21 -
   13.22 -    Sam Lantinga
   13.23 -    slouken@libsdl.org
   13.24 -*/
   13.25 -#include "SDL_config.h"
   13.26 -
   13.27 -/*
   13.28 -	m68k assembly mix routines
   13.29 -
   13.30 -	Patrice Mandin
   13.31 -*/
   13.32 -
   13.33 -#if defined(__M68000__) && !defined(__mcoldfire__) && defined(__GNUC__)
   13.34 -void
   13.35 -SDL_MixAudio_m68k_U8(char *dst, char *src, long len, long volume, char *mix8)
   13.36 -{
   13.37 -    __asm__ __volatile__("tstl	%2\n" "	beqs	stoploop_u8\n" "mixloop_u8:\n"
   13.38 -                         /* Mix a sample */
   13.39 -                         "	moveq	#0,%%d0\n" "	moveq	#0,%%d1\n" "	moveb	%1@+,%%d0\n"    /* d0 = *src++ */
   13.40 -                         "	sub	#128,%%d0\n"    /* d0 -= 128 */
   13.41 -                         "	muls	%3,%%d0\n"      /* d0 *= volume (0<=volume<=128) */
   13.42 -                         "	moveb	%0@,%%d1\n"     /* d1 = *dst */
   13.43 -                         "	asr	#7,%%d0\n"      /* d0 /= 128 (SDL_MIX_MAXVOLUME) */
   13.44 -                         "	add	#128,%%d0\n"    /* d0 += 128 */
   13.45 -                         "	add	%%d1,%%d0\n"
   13.46 -                         "	moveb	%4@(%%d0:w),%0@+\n"
   13.47 -                         /* Loop till done */
   13.48 -                         "	subql	#1,%2\n" "	bhis	mixloop_u8\n" "stoploop_u8:\n": /* no return value */
   13.49 -                         :      /* input */
   13.50 -                         "a"(dst), "a"(src), "d"(len), "d"(volume), "a"(mix8):  /* clobbered registers */
   13.51 -                         "d0", "d1", "cc", "memory");
   13.52 -}
   13.53 -
   13.54 -void
   13.55 -SDL_MixAudio_m68k_S8(char *dst, char *src, long len, long volume)
   13.56 -{
   13.57 -    __asm__ __volatile__("tstl	%2\n"
   13.58 -                         "	beqs	stoploop_s8\n"
   13.59 -                         "	moveq	#-128,%%d2\n"
   13.60 -                         "	moveq	#127,%%d3\n" "mixloop_s8:\n"
   13.61 -                         /* Mix a sample */
   13.62 -                         "	moveq	#0,%%d0\n" "	moveq	#0,%%d1\n" "	moveb	%1@+,%%d0\n"    /* d0 = *src++ */
   13.63 -                         "	muls	%3,%%d0\n"      /* d0 *= volume (0<=volume<=128) */
   13.64 -                         "	moveb	%0@,%%d1\n"     /* d1 = *dst */
   13.65 -                         "	asr	#7,%%d0\n"      /* d0 /= 128 (SDL_MIX_MAXVOLUME) */
   13.66 -                         "	add	%%d1,%%d0\n"
   13.67 -                         "	cmp	%%d2,%%d0\n"
   13.68 -                         "	bges	lower_limit_s8\n"
   13.69 -                         "	move	%%d2,%%d0\n"
   13.70 -                         "lower_limit_s8:\n"
   13.71 -                         "	cmp	%%d3,%%d0\n"
   13.72 -                         "	bles	upper_limit_s8\n"
   13.73 -                         "	move	%%d3,%%d0\n"
   13.74 -                         "upper_limit_s8:\n" "	moveb	%%d0,%0@+\n"
   13.75 -                         /* Loop till done */
   13.76 -                         "	subql	#1,%2\n" "	bhis	mixloop_s8\n" "stoploop_s8:\n": /* no return value */
   13.77 -                         :      /* input */
   13.78 -                         "a"(dst), "a"(src), "d"(len), "d"(volume):     /* clobbered registers */
   13.79 -                         "d0", "d1", "d2", "d3", "cc", "memory");
   13.80 -}
   13.81 -
   13.82 -void
   13.83 -SDL_MixAudio_m68k_S16MSB(short *dst, short *src, long len, long volume)
   13.84 -{
   13.85 -    __asm__ __volatile__("tstl	%2\n"
   13.86 -                         "	beqs	stoploop_s16msb\n"
   13.87 -                         "	movel	#-32768,%%d2\n"
   13.88 -                         "	movel	#32767,%%d3\n"
   13.89 -                         "	lsrl	#1,%2\n" "mixloop_s16msb:\n"
   13.90 -                         /* Mix a sample */
   13.91 -                         "	move	%1@+,%%d0\n"    /* d0 = *src++ */
   13.92 -                         "	muls	%3,%%d0\n"      /* d0 *= volume (0<=volume<=128) */
   13.93 -                         "	move	%0@,%%d1\n"     /* d1 = *dst */
   13.94 -                         "	extl	%%d1\n" /* extend d1 to 32 bits */
   13.95 -                         "	asrl	#7,%%d0\n"      /* d0 /= 128 (SDL_MIX_MAXVOLUME) */
   13.96 -                         "	addl	%%d1,%%d0\n"
   13.97 -                         "	cmpl	%%d2,%%d0\n"
   13.98 -                         "	bges	lower_limit_s16msb\n"
   13.99 -                         "	move	%%d2,%%d0\n"
  13.100 -                         "lower_limit_s16msb:\n"
  13.101 -                         "	cmpl	%%d3,%%d0\n"
  13.102 -                         "	bles	upper_limit_s16msb\n"
  13.103 -                         "	move	%%d3,%%d0\n"
  13.104 -                         "upper_limit_s16msb:\n" "	move	%%d0,%0@+\n"
  13.105 -                         /* Loop till done */
  13.106 -                         "	subql	#1,%2\n" "	bhis	mixloop_s16msb\n" "stoploop_s16msb:\n": /* no return value */
  13.107 -                         :      /* input */
  13.108 -                         "a"(dst), "a"(src), "d"(len), "d"(volume):     /* clobbered registers */
  13.109 -                         "d0", "d1", "d2", "d3", "cc", "memory");
  13.110 -}
  13.111 -
  13.112 -void
  13.113 -SDL_MixAudio_m68k_S16LSB(short *dst, short *src, long len, long volume)
  13.114 -{
  13.115 -    __asm__ __volatile__("tstl	%2\n"
  13.116 -                         "	beqs	stoploop_s16lsb\n"
  13.117 -                         "	movel	#-32768,%%d2\n"
  13.118 -                         "	movel	#32767,%%d3\n"
  13.119 -                         "	lsrl	#1,%2\n" "mixloop_s16lsb:\n"
  13.120 -                         /* Mix a sample */
  13.121 -                         "	move	%1@+,%%d0\n"    /* d0 = *src++ */
  13.122 -                         "	rorw	#8,%%d0\n" "	muls	%3,%%d0\n"      /* d0 *= volume (0<=volume<=128) */
  13.123 -                         "	move	%0@,%%d1\n"     /* d1 = *dst */
  13.124 -                         "	rorw	#8,%%d1\n" "	extl	%%d1\n" /* extend d1 to 32 bits */
  13.125 -                         "	asrl	#7,%%d0\n"      /* d0 /= 128 (SDL_MIX_MAXVOLUME) */
  13.126 -                         "	addl	%%d1,%%d0\n"
  13.127 -                         "	cmpl	%%d2,%%d0\n"
  13.128 -                         "	bges	lower_limit_s16lsb\n"
  13.129 -                         "	move	%%d2,%%d0\n"
  13.130 -                         "lower_limit_s16lsb:\n"
  13.131 -                         "	cmpl	%%d3,%%d0\n"
  13.132 -                         "	bles	upper_limit_s16lsb\n"
  13.133 -                         "	move	%%d3,%%d0\n"
  13.134 -                         "upper_limit_s16lsb:\n"
  13.135 -                         "	rorw	#8,%%d0\n" "	move	%%d0,%0@+\n"
  13.136 -                         /* Loop till done */
  13.137 -                         "	subql	#1,%2\n" "	bhis	mixloop_s16lsb\n" "stoploop_s16lsb:\n": /* no return value */
  13.138 -                         :      /* input */
  13.139 -                         "a"(dst), "a"(src), "d"(len), "d"(volume):     /* clobbered registers */
  13.140 -                         "d0", "d1", "d2", "d3", "cc", "memory");
  13.141 -}
  13.142 -#endif
  13.143 -/* vi: set ts=4 sw=4 expandtab: */
    14.1 --- a/src/audio/SDL_mixer_m68k.h	Fri Apr 08 13:03:26 2011 -0700
    14.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.3 @@ -1,38 +0,0 @@
    14.4 -/*
    14.5 -    SDL - Simple DirectMedia Layer
    14.6 -    Copyright (C) 1997-2011 Sam Lantinga
    14.7 -
    14.8 -    This library is free software; you can redistribute it and/or
    14.9 -    modify it under the terms of the GNU Lesser General Public
   14.10 -    License as published by the Free Software Foundation; either
   14.11 -    version 2.1 of the License, or (at your option) any later version.
   14.12 -
   14.13 -    This library is distributed in the hope that it will be useful,
   14.14 -    but WITHOUT ANY WARRANTY; without even the implied warranty of
   14.15 -    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   14.16 -    Lesser General Public License for more details.
   14.17 -
   14.18 -    You should have received a copy of the GNU Lesser General Public
   14.19 -    License along with this library; if not, write to the Free Software
   14.20 -    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   14.21 -
   14.22 -    Sam Lantinga
   14.23 -    slouken@libsdl.org
   14.24 -*/
   14.25 -#include "SDL_config.h"
   14.26 -
   14.27 -/*
   14.28 -	m68k assembly mix routines
   14.29 -
   14.30 -	Patrice Mandin
   14.31 -*/
   14.32 -
   14.33 -#if defined(__M68000__) && defined(__GNUC__)
   14.34 -void SDL_MixAudio_m68k_U8(char *dst, char *src, long len, long volume,
   14.35 -                          char *mix8);
   14.36 -void SDL_MixAudio_m68k_S8(char *dst, char *src, long len, long volume);
   14.37 -
   14.38 -void SDL_MixAudio_m68k_S16MSB(short *dst, short *src, long len, long volume);
   14.39 -void SDL_MixAudio_m68k_S16LSB(short *dst, short *src, long len, long volume);
   14.40 -#endif
   14.41 -/* vi: set ts=4 sw=4 expandtab: */