Fixed compiling on Windows Mobile SDK 5.0 with Visual Studio 2008
authorSam Lantinga <slouken@libsdl.org>
Mon, 24 Jan 2011 15:46:11 -0800
changeset 5086c2539ff054c8
parent 5085 e7680e2c9f3c
child 5087 b4b0e9f1669c
Fixed compiling on Windows Mobile SDK 5.0 with Visual Studio 2008
VisualCE/SDL.sln
VisualCE/SDL/SDL.vcproj
VisualCE/SDLMain/SDLmain.vcproj
VisualCE/loopwave/loopwave.vcproj
VisualCE/testalpha/testalpha.vcproj
VisualCE/testtimer/testtimer.vcproj
VisualCE/testwin/testwin.vcproj
include/SDL_assert.h
include/SDL_atomic.h
include/SDL_compat.h
include/SDL_config_windows.h
include/SDL_main.h
include/SDL_opengl.h
include/SDL_platform.h
include/SDL_rwops.h
include/SDL_thread.h
include/begin_code.h
src/SDL.c
src/SDL_assert.c
src/atomic/SDL_spinlock.c
src/audio/SDL_audio.c
src/cpuinfo/SDL_cpuinfo.c
src/events/SDL_events.c
src/events/SDL_sysevents.h
src/file/SDL_rwops.c
src/libm/math_private.h
src/loadso/windows/SDL_sysloadso.c
src/power/windows/SDL_syspower.c
src/stdlib/SDL_getenv.c
src/stdlib/SDL_stdlib.c
src/thread/windows/SDL_syssem.c
src/thread/windows/SDL_systhread.c
src/video/SDL_renderer_gl.c
src/video/windows/SDL_gapirender.c
src/video/windows/SDL_gdirender.c
src/video/windows/SDL_windowsevents.c
src/video/windows/SDL_windowskeyboard.c
src/video/windows/SDL_windowsmodes.c
src/video/windows/SDL_windowsvideo.c
src/video/windows/SDL_windowsvideo.h
src/video/windows/SDL_windowswindow.c
test/testgesture.c
     1.1 --- a/VisualCE/SDL.sln	Mon Jan 24 15:10:16 2011 -0800
     1.2 +++ b/VisualCE/SDL.sln	Mon Jan 24 15:46:11 2011 -0800
     1.3 @@ -1,6 +1,6 @@
     1.4  
     1.5 -Microsoft Visual Studio Solution File, Format Version 9.00
     1.6 -# Visual Studio 2005
     1.7 +Microsoft Visual Studio Solution File, Format Version 10.00
     1.8 +# Visual Studio 2008
     1.9  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "SDL\SDL.vcproj", "{C598024D-8030-4F9C-AB76-69BF4CA0645F}"
    1.10  EndProject
    1.11  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "SDLmain\SDLmain.vcproj", "{5AC88B84-5EAA-4C1E-948D-332DA34227F6}"
     2.1 --- a/VisualCE/SDL/SDL.vcproj	Mon Jan 24 15:10:16 2011 -0800
     2.2 +++ b/VisualCE/SDL/SDL.vcproj	Mon Jan 24 15:46:11 2011 -0800
     2.3 @@ -1,10 +1,11 @@
     2.4  <?xml version="1.0" encoding="windows-1251"?>
     2.5  <VisualStudioProject
     2.6  	ProjectType="Visual C++"
     2.7 -	Version="8,00"
     2.8 +	Version="9.00"
     2.9  	Name="SDL"
    2.10  	ProjectGUID="{C598024D-8030-4F9C-AB76-69BF4CA0645F}"
    2.11  	RootNamespace="SDL"
    2.12 +	TargetFrameworkVersion="131072"
    2.13  	>
    2.14  	<Platforms>
    2.15  		<Platform
    2.16 @@ -93,6 +94,8 @@
    2.17  				StackCommitSize="4096"
    2.18  				EntryPointSymbol="_DllMainCRTStartup"
    2.19  				BaseAddress="0x00100000"
    2.20 +				RandomizedBaseAddress="1"
    2.21 +				DataExecutionPrevention="0"
    2.22  				ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib"
    2.23  			/>
    2.24  			<Tool
    2.25 @@ -107,6 +110,9 @@
    2.26  				OutputFile="$(PlatformName)\$(ConfigurationName)/SDL.bsc"
    2.27  			/>
    2.28  			<Tool
    2.29 +				Name="VCFxCopTool"
    2.30 +			/>
    2.31 +			<Tool
    2.32  				Name="VCCodeSignTool"
    2.33  			/>
    2.34  			<Tool
    2.35 @@ -195,6 +201,8 @@
    2.36  				StackCommitSize="4096"
    2.37  				EntryPointSymbol="_DllMainCRTStartup"
    2.38  				BaseAddress="0x00100000"
    2.39 +				RandomizedBaseAddress="1"
    2.40 +				DataExecutionPrevention="0"
    2.41  				ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib"
    2.42  			/>
    2.43  			<Tool
    2.44 @@ -209,6 +217,9 @@
    2.45  				OutputFile="$(PlatformName)\$(ConfigurationName)/SDL.bsc"
    2.46  			/>
    2.47  			<Tool
    2.48 +				Name="VCFxCopTool"
    2.49 +			/>
    2.50 +			<Tool
    2.51  				Name="VCCodeSignTool"
    2.52  			/>
    2.53  			<Tool
    2.54 @@ -296,6 +307,8 @@
    2.55  				StackCommitSize="4096"
    2.56  				EntryPointSymbol="_DllMainCRTStartup"
    2.57  				BaseAddress="0x00100000"
    2.58 +				RandomizedBaseAddress="1"
    2.59 +				DataExecutionPrevention="0"
    2.60  				ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib"
    2.61  			/>
    2.62  			<Tool
    2.63 @@ -310,6 +323,9 @@
    2.64  				OutputFile="$(PlatformName)\$(ConfigurationName)/SDL.bsc"
    2.65  			/>
    2.66  			<Tool
    2.67 +				Name="VCFxCopTool"
    2.68 +			/>
    2.69 +			<Tool
    2.70  				Name="VCCodeSignTool"
    2.71  			/>
    2.72  			<Tool
    2.73 @@ -396,6 +412,8 @@
    2.74  				StackCommitSize="4096"
    2.75  				EntryPointSymbol="_DllMainCRTStartup"
    2.76  				BaseAddress="0x00100000"
    2.77 +				RandomizedBaseAddress="1"
    2.78 +				DataExecutionPrevention="0"
    2.79  				ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib"
    2.80  			/>
    2.81  			<Tool
    2.82 @@ -410,6 +428,9 @@
    2.83  				OutputFile="$(PlatformName)\$(ConfigurationName)/SDL.bsc"
    2.84  			/>
    2.85  			<Tool
    2.86 +				Name="VCFxCopTool"
    2.87 +			/>
    2.88 +			<Tool
    2.89  				Name="VCCodeSignTool"
    2.90  			/>
    2.91  			<Tool
    2.92 @@ -500,6 +521,8 @@
    2.93  				StackCommitSize="4096"
    2.94  				EntryPointSymbol="_DllMainCRTStartup"
    2.95  				BaseAddress="0x00100000"
    2.96 +				RandomizedBaseAddress="1"
    2.97 +				DataExecutionPrevention="0"
    2.98  				ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib"
    2.99  			/>
   2.100  			<Tool
   2.101 @@ -514,6 +537,9 @@
   2.102  				OutputFile="$(PlatformName)\$(ConfigurationName)/SDL.bsc"
   2.103  			/>
   2.104  			<Tool
   2.105 +				Name="VCFxCopTool"
   2.106 +			/>
   2.107 +			<Tool
   2.108  				Name="VCCodeSignTool"
   2.109  			/>
   2.110  			<Tool
   2.111 @@ -606,6 +632,8 @@
   2.112  				LinkTimeCodeGeneration="1"
   2.113  				EntryPointSymbol="_DllMainCRTStartup"
   2.114  				BaseAddress="0x00100000"
   2.115 +				RandomizedBaseAddress="1"
   2.116 +				DataExecutionPrevention="0"
   2.117  				ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib"
   2.118  			/>
   2.119  			<Tool
   2.120 @@ -620,6 +648,9 @@
   2.121  				OutputFile="$(PlatformName)\$(ConfigurationName)/SDL.bsc"
   2.122  			/>
   2.123  			<Tool
   2.124 +				Name="VCFxCopTool"
   2.125 +			/>
   2.126 +			<Tool
   2.127  				Name="VCCodeSignTool"
   2.128  			/>
   2.129  			<Tool
   2.130 @@ -643,1294 +674,238 @@
   2.131  			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
   2.132  			>
   2.133  			<File
   2.134 +				RelativePath="..\..\src\libm\e_atan2.c"
   2.135 +				>
   2.136 +			</File>
   2.137 +			<File
   2.138 +				RelativePath="..\..\src\libm\e_log.c"
   2.139 +				>
   2.140 +			</File>
   2.141 +			<File
   2.142 +				RelativePath="..\..\src\libm\e_pow.c"
   2.143 +				>
   2.144 +			</File>
   2.145 +			<File
   2.146 +				RelativePath="..\..\src\libm\e_rem_pio2.c"
   2.147 +				>
   2.148 +			</File>
   2.149 +			<File
   2.150 +				RelativePath="..\..\src\libm\e_sqrt.c"
   2.151 +				>
   2.152 +			</File>
   2.153 +			<File
   2.154 +				RelativePath="..\..\src\libm\k_cos.c"
   2.155 +				>
   2.156 +			</File>
   2.157 +			<File
   2.158 +				RelativePath="..\..\src\libm\k_rem_pio2.c"
   2.159 +				>
   2.160 +			</File>
   2.161 +			<File
   2.162 +				RelativePath="..\..\src\libm\k_sin.c"
   2.163 +				>
   2.164 +			</File>
   2.165 +			<File
   2.166 +				RelativePath="..\..\src\libm\s_atan.c"
   2.167 +				>
   2.168 +			</File>
   2.169 +			<File
   2.170 +				RelativePath="..\..\src\libm\s_copysign.c"
   2.171 +				>
   2.172 +			</File>
   2.173 +			<File
   2.174 +				RelativePath="..\..\src\libm\s_cos.c"
   2.175 +				>
   2.176 +			</File>
   2.177 +			<File
   2.178 +				RelativePath="..\..\src\libm\s_fabs.c"
   2.179 +				>
   2.180 +			</File>
   2.181 +			<File
   2.182 +				RelativePath="..\..\src\libm\s_floor.c"
   2.183 +				>
   2.184 +			</File>
   2.185 +			<File
   2.186 +				RelativePath="..\..\src\libm\s_scalbn.c"
   2.187 +				>
   2.188 +			</File>
   2.189 +			<File
   2.190 +				RelativePath="..\..\src\libm\s_sin.c"
   2.191 +				>
   2.192 +			</File>
   2.193 +			<File
   2.194  				RelativePath="..\..\src\SDL.c"
   2.195  				>
   2.196 -				<FileConfiguration
   2.197 -					Name="Debug|Smartphone 2003 (ARMV4)"
   2.198 -					>
   2.199 -					<Tool
   2.200 -						Name="VCCLCompilerTool"
   2.201 -						AdditionalIncludeDirectories=""
   2.202 -						UsePrecompiledHeader="0"
   2.203 -					/>
   2.204 -				</FileConfiguration>
   2.205 -				<FileConfiguration
   2.206 -					Name="Debug|Pocket PC 2003 (ARMV4)"
   2.207 -					>
   2.208 -					<Tool
   2.209 -						Name="VCCLCompilerTool"
   2.210 -						AdditionalIncludeDirectories=""
   2.211 -						UsePrecompiledHeader="0"
   2.212 -					/>
   2.213 -				</FileConfiguration>
   2.214 -				<FileConfiguration
   2.215 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   2.216 -					>
   2.217 -					<Tool
   2.218 -						Name="VCCLCompilerTool"
   2.219 -						AdditionalIncludeDirectories=""
   2.220 -						UsePrecompiledHeader="0"
   2.221 -					/>
   2.222 -				</FileConfiguration>
   2.223 -				<FileConfiguration
   2.224 -					Name="Release|Smartphone 2003 (ARMV4)"
   2.225 -					>
   2.226 -					<Tool
   2.227 -						Name="VCCLCompilerTool"
   2.228 -						AdditionalIncludeDirectories=""
   2.229 -						UsePrecompiledHeader="0"
   2.230 -					/>
   2.231 -				</FileConfiguration>
   2.232 -				<FileConfiguration
   2.233 -					Name="Release|Pocket PC 2003 (ARMV4)"
   2.234 -					>
   2.235 -					<Tool
   2.236 -						Name="VCCLCompilerTool"
   2.237 -						AdditionalIncludeDirectories=""
   2.238 -						UsePrecompiledHeader="0"
   2.239 -					/>
   2.240 -				</FileConfiguration>
   2.241 -				<FileConfiguration
   2.242 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   2.243 -					>
   2.244 -					<Tool
   2.245 -						Name="VCCLCompilerTool"
   2.246 -						AdditionalIncludeDirectories=""
   2.247 -						UsePrecompiledHeader="0"
   2.248 -					/>
   2.249 -				</FileConfiguration>
   2.250  			</File>
   2.251  			<File
   2.252 -				RelativePath="..\..\src\events\SDL_active.c"
   2.253 +				RelativePath="..\..\src\video\SDL_alphamult.c"
   2.254  				>
   2.255 -				<FileConfiguration
   2.256 -					Name="Debug|Smartphone 2003 (ARMV4)"
   2.257 -					>
   2.258 -					<Tool
   2.259 -						Name="VCCLCompilerTool"
   2.260 -						AdditionalIncludeDirectories=""
   2.261 -						UsePrecompiledHeader="0"
   2.262 -					/>
   2.263 -				</FileConfiguration>
   2.264 -				<FileConfiguration
   2.265 -					Name="Debug|Pocket PC 2003 (ARMV4)"
   2.266 -					>
   2.267 -					<Tool
   2.268 -						Name="VCCLCompilerTool"
   2.269 -						AdditionalIncludeDirectories=""
   2.270 -						UsePrecompiledHeader="0"
   2.271 -					/>
   2.272 -				</FileConfiguration>
   2.273 -				<FileConfiguration
   2.274 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   2.275 -					>
   2.276 -					<Tool
   2.277 -						Name="VCCLCompilerTool"
   2.278 -						AdditionalIncludeDirectories=""
   2.279 -						UsePrecompiledHeader="0"
   2.280 -					/>
   2.281 -				</FileConfiguration>
   2.282 -				<FileConfiguration
   2.283 -					Name="Release|Smartphone 2003 (ARMV4)"
   2.284 -					>
   2.285 -					<Tool
   2.286 -						Name="VCCLCompilerTool"
   2.287 -						AdditionalIncludeDirectories=""
   2.288 -						UsePrecompiledHeader="0"
   2.289 -					/>
   2.290 -				</FileConfiguration>
   2.291 -				<FileConfiguration
   2.292 -					Name="Release|Pocket PC 2003 (ARMV4)"
   2.293 -					>
   2.294 -					<Tool
   2.295 -						Name="VCCLCompilerTool"
   2.296 -						AdditionalIncludeDirectories=""
   2.297 -						UsePrecompiledHeader="0"
   2.298 -					/>
   2.299 -				</FileConfiguration>
   2.300 -				<FileConfiguration
   2.301 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   2.302 -					>
   2.303 -					<Tool
   2.304 -						Name="VCCLCompilerTool"
   2.305 -						AdditionalIncludeDirectories=""
   2.306 -						UsePrecompiledHeader="0"
   2.307 -					/>
   2.308 -				</FileConfiguration>
   2.309 +			</File>
   2.310 +			<File
   2.311 +				RelativePath="..\..\src\SDL_assert.c"
   2.312 +				>
   2.313 +			</File>
   2.314 +			<File
   2.315 +				RelativePath="..\..\src\atomic\SDL_atomic.c"
   2.316 +				>
   2.317  			</File>
   2.318  			<File
   2.319  				RelativePath="..\..\src\audio\SDL_audio.c"
   2.320  				>
   2.321 -				<FileConfiguration
   2.322 -					Name="Debug|Smartphone 2003 (ARMV4)"
   2.323 -					>
   2.324 -					<Tool
   2.325 -						Name="VCCLCompilerTool"
   2.326 -						AdditionalIncludeDirectories=""
   2.327 -						UsePrecompiledHeader="0"
   2.328 -					/>
   2.329 -				</FileConfiguration>
   2.330 -				<FileConfiguration
   2.331 -					Name="Debug|Pocket PC 2003 (ARMV4)"
   2.332 -					>
   2.333 -					<Tool
   2.334 -						Name="VCCLCompilerTool"
   2.335 -						AdditionalIncludeDirectories=""
   2.336 -						UsePrecompiledHeader="0"
   2.337 -					/>
   2.338 -				</FileConfiguration>
   2.339 -				<FileConfiguration
   2.340 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   2.341 -					>
   2.342 -					<Tool
   2.343 -						Name="VCCLCompilerTool"
   2.344 -						AdditionalIncludeDirectories=""
   2.345 -						UsePrecompiledHeader="0"
   2.346 -					/>
   2.347 -				</FileConfiguration>
   2.348 -				<FileConfiguration
   2.349 -					Name="Release|Smartphone 2003 (ARMV4)"
   2.350 -					>
   2.351 -					<Tool
   2.352 -						Name="VCCLCompilerTool"
   2.353 -						AdditionalIncludeDirectories=""
   2.354 -						UsePrecompiledHeader="0"
   2.355 -					/>
   2.356 -				</FileConfiguration>
   2.357 -				<FileConfiguration
   2.358 -					Name="Release|Pocket PC 2003 (ARMV4)"
   2.359 -					>
   2.360 -					<Tool
   2.361 -						Name="VCCLCompilerTool"
   2.362 -						AdditionalIncludeDirectories=""
   2.363 -						UsePrecompiledHeader="0"
   2.364 -					/>
   2.365 -				</FileConfiguration>
   2.366 -				<FileConfiguration
   2.367 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   2.368 -					>
   2.369 -					<Tool
   2.370 -						Name="VCCLCompilerTool"
   2.371 -						AdditionalIncludeDirectories=""
   2.372 -						UsePrecompiledHeader="0"
   2.373 -					/>
   2.374 -				</FileConfiguration>
   2.375  			</File>
   2.376  			<File
   2.377  				RelativePath="..\..\src\audio\SDL_audiocvt.c"
   2.378  				>
   2.379 -				<FileConfiguration
   2.380 -					Name="Debug|Smartphone 2003 (ARMV4)"
   2.381 -					>
   2.382 -					<Tool
   2.383 -						Name="VCCLCompilerTool"
   2.384 -						AdditionalIncludeDirectories=""
   2.385 -						UsePrecompiledHeader="0"
   2.386 -					/>
   2.387 -				</FileConfiguration>
   2.388 -				<FileConfiguration
   2.389 -					Name="Debug|Pocket PC 2003 (ARMV4)"
   2.390 -					>
   2.391 -					<Tool
   2.392 -						Name="VCCLCompilerTool"
   2.393 -						AdditionalIncludeDirectories=""
   2.394 -						UsePrecompiledHeader="0"
   2.395 -					/>
   2.396 -				</FileConfiguration>
   2.397 -				<FileConfiguration
   2.398 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   2.399 -					>
   2.400 -					<Tool
   2.401 -						Name="VCCLCompilerTool"
   2.402 -						AdditionalIncludeDirectories=""
   2.403 -						UsePrecompiledHeader="0"
   2.404 -					/>
   2.405 -				</FileConfiguration>
   2.406 -				<FileConfiguration
   2.407 -					Name="Release|Smartphone 2003 (ARMV4)"
   2.408 -					>
   2.409 -					<Tool
   2.410 -						Name="VCCLCompilerTool"
   2.411 -						AdditionalIncludeDirectories=""
   2.412 -						UsePrecompiledHeader="0"
   2.413 -					/>
   2.414 -				</FileConfiguration>
   2.415 -				<FileConfiguration
   2.416 -					Name="Release|Pocket PC 2003 (ARMV4)"
   2.417 -					>
   2.418 -					<Tool
   2.419 -						Name="VCCLCompilerTool"
   2.420 -						AdditionalIncludeDirectories=""
   2.421 -						UsePrecompiledHeader="0"
   2.422 -					/>
   2.423 -				</FileConfiguration>
   2.424 -				<FileConfiguration
   2.425 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   2.426 -					>
   2.427 -					<Tool
   2.428 -						Name="VCCLCompilerTool"
   2.429 -						AdditionalIncludeDirectories=""
   2.430 -						UsePrecompiledHeader="0"
   2.431 -					/>
   2.432 -				</FileConfiguration>
   2.433  			</File>
   2.434  			<File
   2.435  				RelativePath="..\..\src\audio\SDL_audiodev.c"
   2.436  				>
   2.437 -				<FileConfiguration
   2.438 -					Name="Debug|Smartphone 2003 (ARMV4)"
   2.439 -					>
   2.440 -					<Tool
   2.441 -						Name="VCCLCompilerTool"
   2.442 -						AdditionalIncludeDirectories=""
   2.443 -						UsePrecompiledHeader="0"
   2.444 -					/>
   2.445 -				</FileConfiguration>
   2.446 -				<FileConfiguration
   2.447 -					Name="Debug|Pocket PC 2003 (ARMV4)"
   2.448 -					>
   2.449 -					<Tool
   2.450 -						Name="VCCLCompilerTool"
   2.451 -						AdditionalIncludeDirectories=""
   2.452 -						UsePrecompiledHeader="0"
   2.453 -					/>
   2.454 -				</FileConfiguration>
   2.455 -				<FileConfiguration
   2.456 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   2.457 -					>
   2.458 -					<Tool
   2.459 -						Name="VCCLCompilerTool"
   2.460 -						AdditionalIncludeDirectories=""
   2.461 -						UsePrecompiledHeader="0"
   2.462 -					/>
   2.463 -				</FileConfiguration>
   2.464 -				<FileConfiguration
   2.465 -					Name="Release|Smartphone 2003 (ARMV4)"
   2.466 -					>
   2.467 -					<Tool
   2.468 -						Name="VCCLCompilerTool"
   2.469 -						AdditionalIncludeDirectories=""
   2.470 -						UsePrecompiledHeader="0"
   2.471 -					/>
   2.472 -				</FileConfiguration>
   2.473 -				<FileConfiguration
   2.474 -					Name="Release|Pocket PC 2003 (ARMV4)"
   2.475 -					>
   2.476 -					<Tool
   2.477 -						Name="VCCLCompilerTool"
   2.478 -						AdditionalIncludeDirectories=""
   2.479 -						UsePrecompiledHeader="0"
   2.480 -					/>
   2.481 -				</FileConfiguration>
   2.482 -				<FileConfiguration
   2.483 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   2.484 -					>
   2.485 -					<Tool
   2.486 -						Name="VCCLCompilerTool"
   2.487 -						AdditionalIncludeDirectories=""
   2.488 -						UsePrecompiledHeader="0"
   2.489 -					/>
   2.490 -				</FileConfiguration>
   2.491 +			</File>
   2.492 +			<File
   2.493 +				RelativePath="..\..\src\audio\SDL_audiotypecvt.c"
   2.494 +				>
   2.495 +			</File>
   2.496 +			<File
   2.497 +				RelativePath="..\..\src\video\SDL_blendfillrect.c"
   2.498 +				>
   2.499 +			</File>
   2.500 +			<File
   2.501 +				RelativePath="..\..\src\video\SDL_blendline.c"
   2.502 +				>
   2.503 +			</File>
   2.504 +			<File
   2.505 +				RelativePath="..\..\src\video\SDL_blendpoint.c"
   2.506 +				>
   2.507 +			</File>
   2.508 +			<File
   2.509 +				RelativePath="..\..\src\video\SDL_blendrect.c"
   2.510 +				>
   2.511  			</File>
   2.512  			<File
   2.513  				RelativePath="..\..\src\video\SDL_blit.c"
   2.514  				>
   2.515 -				<FileConfiguration
   2.516 -					Name="Debug|Smartphone 2003 (ARMV4)"
   2.517 -					>
   2.518 -					<Tool
   2.519 -						Name="VCCLCompilerTool"
   2.520 -						AdditionalIncludeDirectories=""
   2.521 -						UsePrecompiledHeader="0"
   2.522 -					/>
   2.523 -				</FileConfiguration>
   2.524 -				<FileConfiguration
   2.525 -					Name="Debug|Pocket PC 2003 (ARMV4)"
   2.526 -					>
   2.527 -					<Tool
   2.528 -						Name="VCCLCompilerTool"
   2.529 -						AdditionalIncludeDirectories=""
   2.530 -						UsePrecompiledHeader="0"
   2.531 -					/>
   2.532 -				</FileConfiguration>
   2.533 -				<FileConfiguration
   2.534 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   2.535 -					>
   2.536 -					<Tool
   2.537 -						Name="VCCLCompilerTool"
   2.538 -						AdditionalIncludeDirectories=""
   2.539 -						UsePrecompiledHeader="0"
   2.540 -					/>
   2.541 -				</FileConfiguration>
   2.542 -				<FileConfiguration
   2.543 -					Name="Release|Smartphone 2003 (ARMV4)"
   2.544 -					>
   2.545 -					<Tool
   2.546 -						Name="VCCLCompilerTool"
   2.547 -						AdditionalIncludeDirectories=""
   2.548 -						UsePrecompiledHeader="0"
   2.549 -					/>
   2.550 -				</FileConfiguration>
   2.551 -				<FileConfiguration
   2.552 -					Name="Release|Pocket PC 2003 (ARMV4)"
   2.553 -					>
   2.554 -					<Tool
   2.555 -						Name="VCCLCompilerTool"
   2.556 -						AdditionalIncludeDirectories=""
   2.557 -						UsePrecompiledHeader="0"
   2.558 -					/>
   2.559 -				</FileConfiguration>
   2.560 -				<FileConfiguration
   2.561 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   2.562 -					>
   2.563 -					<Tool
   2.564 -						Name="VCCLCompilerTool"
   2.565 -						AdditionalIncludeDirectories=""
   2.566 -						UsePrecompiledHeader="0"
   2.567 -					/>
   2.568 -				</FileConfiguration>
   2.569  			</File>
   2.570  			<File
   2.571  				RelativePath="..\..\src\video\SDL_blit_0.c"
   2.572  				>
   2.573 -				<FileConfiguration
   2.574 -					Name="Debug|Smartphone 2003 (ARMV4)"
   2.575 -					>
   2.576 -					<Tool
   2.577 -						Name="VCCLCompilerTool"
   2.578 -						AdditionalIncludeDirectories=""
   2.579 -						UsePrecompiledHeader="0"
   2.580 -					/>
   2.581 -				</FileConfiguration>
   2.582 -				<FileConfiguration
   2.583 -					Name="Debug|Pocket PC 2003 (ARMV4)"
   2.584 -					>
   2.585 -					<Tool
   2.586 -						Name="VCCLCompilerTool"
   2.587 -						AdditionalIncludeDirectories=""
   2.588 -						UsePrecompiledHeader="0"
   2.589 -					/>
   2.590 -				</FileConfiguration>
   2.591 -				<FileConfiguration
   2.592 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   2.593 -					>
   2.594 -					<Tool
   2.595 -						Name="VCCLCompilerTool"
   2.596 -						AdditionalIncludeDirectories=""
   2.597 -						UsePrecompiledHeader="0"
   2.598 -					/>
   2.599 -				</FileConfiguration>
   2.600 -				<FileConfiguration
   2.601 -					Name="Release|Smartphone 2003 (ARMV4)"
   2.602 -					>
   2.603 -					<Tool
   2.604 -						Name="VCCLCompilerTool"
   2.605 -						AdditionalIncludeDirectories=""
   2.606 -						UsePrecompiledHeader="0"
   2.607 -					/>
   2.608 -				</FileConfiguration>
   2.609 -				<FileConfiguration
   2.610 -					Name="Release|Pocket PC 2003 (ARMV4)"
   2.611 -					>
   2.612 -					<Tool
   2.613 -						Name="VCCLCompilerTool"
   2.614 -						AdditionalIncludeDirectories=""
   2.615 -						UsePrecompiledHeader="0"
   2.616 -					/>
   2.617 -				</FileConfiguration>
   2.618 -				<FileConfiguration
   2.619 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   2.620 -					>
   2.621 -					<Tool
   2.622 -						Name="VCCLCompilerTool"
   2.623 -						AdditionalIncludeDirectories=""
   2.624 -						UsePrecompiledHeader="0"
   2.625 -					/>
   2.626 -				</FileConfiguration>
   2.627  			</File>
   2.628  			<File
   2.629  				RelativePath="..\..\src\video\SDL_blit_1.c"
   2.630  				>
   2.631 -				<FileConfiguration
   2.632 -					Name="Debug|Smartphone 2003 (ARMV4)"
   2.633 -					>
   2.634 -					<Tool
   2.635 -						Name="VCCLCompilerTool"
   2.636 -						AdditionalIncludeDirectories=""
   2.637 -						UsePrecompiledHeader="0"
   2.638 -					/>
   2.639 -				</FileConfiguration>
   2.640 -				<FileConfiguration
   2.641 -					Name="Debug|Pocket PC 2003 (ARMV4)"
   2.642 -					>
   2.643 -					<Tool
   2.644 -						Name="VCCLCompilerTool"
   2.645 -						AdditionalIncludeDirectories=""
   2.646 -						UsePrecompiledHeader="0"
   2.647 -					/>
   2.648 -				</FileConfiguration>
   2.649 -				<FileConfiguration
   2.650 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   2.651 -					>
   2.652 -					<Tool
   2.653 -						Name="VCCLCompilerTool"
   2.654 -						AdditionalIncludeDirectories=""
   2.655 -						UsePrecompiledHeader="0"
   2.656 -					/>
   2.657 -				</FileConfiguration>
   2.658 -				<FileConfiguration
   2.659 -					Name="Release|Smartphone 2003 (ARMV4)"
   2.660 -					>
   2.661 -					<Tool
   2.662 -						Name="VCCLCompilerTool"
   2.663 -						AdditionalIncludeDirectories=""
   2.664 -						UsePrecompiledHeader="0"
   2.665 -					/>
   2.666 -				</FileConfiguration>
   2.667 -				<FileConfiguration
   2.668 -					Name="Release|Pocket PC 2003 (ARMV4)"
   2.669 -					>
   2.670 -					<Tool
   2.671 -						Name="VCCLCompilerTool"
   2.672 -						AdditionalIncludeDirectories=""
   2.673 -						UsePrecompiledHeader="0"
   2.674 -					/>
   2.675 -				</FileConfiguration>
   2.676 -				<FileConfiguration
   2.677 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   2.678 -					>
   2.679 -					<Tool
   2.680 -						Name="VCCLCompilerTool"
   2.681 -						AdditionalIncludeDirectories=""
   2.682 -						UsePrecompiledHeader="0"
   2.683 -					/>
   2.684 -				</FileConfiguration>
   2.685  			</File>
   2.686  			<File
   2.687  				RelativePath="..\..\src\video\SDL_blit_A.c"
   2.688  				>
   2.689 -				<FileConfiguration
   2.690 -					Name="Debug|Smartphone 2003 (ARMV4)"
   2.691 -					>
   2.692 -					<Tool
   2.693 -						Name="VCCLCompilerTool"
   2.694 -						AdditionalIncludeDirectories=""
   2.695 -						UsePrecompiledHeader="0"
   2.696 -					/>
   2.697 -				</FileConfiguration>
   2.698 -				<FileConfiguration
   2.699 -					Name="Debug|Pocket PC 2003 (ARMV4)"
   2.700 -					>
   2.701 -					<Tool
   2.702 -						Name="VCCLCompilerTool"
   2.703 -						AdditionalIncludeDirectories=""
   2.704 -						UsePrecompiledHeader="0"
   2.705 -					/>
   2.706 -				</FileConfiguration>
   2.707 -				<FileConfiguration
   2.708 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   2.709 -					>
   2.710 -					<Tool
   2.711 -						Name="VCCLCompilerTool"
   2.712 -						AdditionalIncludeDirectories=""
   2.713 -						UsePrecompiledHeader="0"
   2.714 -					/>
   2.715 -				</FileConfiguration>
   2.716 -				<FileConfiguration
   2.717 -					Name="Release|Smartphone 2003 (ARMV4)"
   2.718 -					>
   2.719 -					<Tool
   2.720 -						Name="VCCLCompilerTool"
   2.721 -						AdditionalIncludeDirectories=""
   2.722 -						UsePrecompiledHeader="0"
   2.723 -					/>
   2.724 -				</FileConfiguration>
   2.725 -				<FileConfiguration
   2.726 -					Name="Release|Pocket PC 2003 (ARMV4)"
   2.727 -					>
   2.728 -					<Tool
   2.729 -						Name="VCCLCompilerTool"
   2.730 -						AdditionalIncludeDirectories=""
   2.731 -						UsePrecompiledHeader="0"
   2.732 -					/>
   2.733 -				</FileConfiguration>
   2.734 -				<FileConfiguration
   2.735 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   2.736 -					>
   2.737 -					<Tool
   2.738 -						Name="VCCLCompilerTool"
   2.739 -						AdditionalIncludeDirectories=""
   2.740 -						UsePrecompiledHeader="0"
   2.741 -					/>
   2.742 -				</FileConfiguration>
   2.743 +			</File>
   2.744 +			<File
   2.745 +				RelativePath="..\..\src\video\SDL_blit_auto.c"
   2.746 +				>
   2.747 +			</File>
   2.748 +			<File
   2.749 +				RelativePath="..\..\src\video\SDL_blit_copy.c"
   2.750 +				>
   2.751  			</File>
   2.752  			<File
   2.753  				RelativePath="..\..\src\video\SDL_blit_N.c"
   2.754  				>
   2.755 -				<FileConfiguration
   2.756 -					Name="Debug|Smartphone 2003 (ARMV4)"
   2.757 -					>
   2.758 -					<Tool
   2.759 -						Name="VCCLCompilerTool"
   2.760 -						AdditionalIncludeDirectories=""
   2.761 -						UsePrecompiledHeader="0"
   2.762 -					/>
   2.763 -				</FileConfiguration>
   2.764 -				<FileConfiguration
   2.765 -					Name="Debug|Pocket PC 2003 (ARMV4)"
   2.766 -					>
   2.767 -					<Tool
   2.768 -						Name="VCCLCompilerTool"
   2.769 -						AdditionalIncludeDirectories=""
   2.770 -						UsePrecompiledHeader="0"
   2.771 -					/>
   2.772 -				</FileConfiguration>
   2.773 -				<FileConfiguration
   2.774 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   2.775 -					>
   2.776 -					<Tool
   2.777 -						Name="VCCLCompilerTool"
   2.778 -						AdditionalIncludeDirectories=""
   2.779 -						UsePrecompiledHeader="0"
   2.780 -					/>
   2.781 -				</FileConfiguration>
   2.782 -				<FileConfiguration
   2.783 -					Name="Release|Smartphone 2003 (ARMV4)"
   2.784 -					>
   2.785 -					<Tool
   2.786 -						Name="VCCLCompilerTool"
   2.787 -						AdditionalIncludeDirectories=""
   2.788 -						UsePrecompiledHeader="0"
   2.789 -					/>
   2.790 -				</FileConfiguration>
   2.791 -				<FileConfiguration
   2.792 -					Name="Release|Pocket PC 2003 (ARMV4)"
   2.793 -					>
   2.794 -					<Tool
   2.795 -						Name="VCCLCompilerTool"
   2.796 -						AdditionalIncludeDirectories=""
   2.797 -						UsePrecompiledHeader="0"
   2.798 -					/>
   2.799 -				</FileConfiguration>
   2.800 -				<FileConfiguration
   2.801 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   2.802 -					>
   2.803 -					<Tool
   2.804 -						Name="VCCLCompilerTool"
   2.805 -						AdditionalIncludeDirectories=""
   2.806 -						UsePrecompiledHeader="0"
   2.807 -					/>
   2.808 -				</FileConfiguration>
   2.809 +			</File>
   2.810 +			<File
   2.811 +				RelativePath="..\..\src\video\SDL_blit_slow.c"
   2.812 +				>
   2.813  			</File>
   2.814  			<File
   2.815  				RelativePath="..\..\src\video\SDL_bmp.c"
   2.816  				>
   2.817 -				<FileConfiguration
   2.818 -					Name="Debug|Smartphone 2003 (ARMV4)"
   2.819 -					>
   2.820 -					<Tool
   2.821 -						Name="VCCLCompilerTool"
   2.822 -						AdditionalIncludeDirectories=""
   2.823 -						UsePrecompiledHeader="0"
   2.824 -					/>
   2.825 -				</FileConfiguration>
   2.826 -				<FileConfiguration
   2.827 -					Name="Debug|Pocket PC 2003 (ARMV4)"
   2.828 -					>
   2.829 -					<Tool
   2.830 -						Name="VCCLCompilerTool"
   2.831 -						AdditionalIncludeDirectories=""
   2.832 -						UsePrecompiledHeader="0"
   2.833 -					/>
   2.834 -				</FileConfiguration>
   2.835 -				<FileConfiguration
   2.836 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   2.837 -					>
   2.838 -					<Tool
   2.839 -						Name="VCCLCompilerTool"
   2.840 -						AdditionalIncludeDirectories=""
   2.841 -						UsePrecompiledHeader="0"
   2.842 -					/>
   2.843 -				</FileConfiguration>
   2.844 -				<FileConfiguration
   2.845 -					Name="Release|Smartphone 2003 (ARMV4)"
   2.846 -					>
   2.847 -					<Tool
   2.848 -						Name="VCCLCompilerTool"
   2.849 -						AdditionalIncludeDirectories=""
   2.850 -						UsePrecompiledHeader="0"
   2.851 -					/>
   2.852 -				</FileConfiguration>
   2.853 -				<FileConfiguration
   2.854 -					Name="Release|Pocket PC 2003 (ARMV4)"
   2.855 -					>
   2.856 -					<Tool
   2.857 -						Name="VCCLCompilerTool"
   2.858 -						AdditionalIncludeDirectories=""
   2.859 -						UsePrecompiledHeader="0"
   2.860 -					/>
   2.861 -				</FileConfiguration>
   2.862 -				<FileConfiguration
   2.863 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   2.864 -					>
   2.865 -					<Tool
   2.866 -						Name="VCCLCompilerTool"
   2.867 -						AdditionalIncludeDirectories=""
   2.868 -						UsePrecompiledHeader="0"
   2.869 -					/>
   2.870 -				</FileConfiguration>
   2.871 +			</File>
   2.872 +			<File
   2.873 +				RelativePath="..\..\src\video\windows\SDL_ceddrawrender.c"
   2.874 +				>
   2.875 +			</File>
   2.876 +			<File
   2.877 +				RelativePath="..\..\src\video\SDL_clipboard.c"
   2.878 +				>
   2.879 +			</File>
   2.880 +			<File
   2.881 +				RelativePath="..\..\src\events\SDL_clipboardevents.c"
   2.882 +				>
   2.883 +			</File>
   2.884 +			<File
   2.885 +				RelativePath="..\..\src\SDL_compat.c"
   2.886 +				>
   2.887  			</File>
   2.888  			<File
   2.889  				RelativePath="..\..\src\cpuinfo\SDL_cpuinfo.c"
   2.890  				>
   2.891 -				<FileConfiguration
   2.892 -					Name="Debug|Smartphone 2003 (ARMV4)"
   2.893 -					>
   2.894 -					<Tool
   2.895 -						Name="VCCLCompilerTool"
   2.896 -						AdditionalIncludeDirectories=""
   2.897 -						UsePrecompiledHeader="0"
   2.898 -					/>
   2.899 -				</FileConfiguration>
   2.900 -				<FileConfiguration
   2.901 -					Name="Debug|Pocket PC 2003 (ARMV4)"
   2.902 -					>
   2.903 -					<Tool
   2.904 -						Name="VCCLCompilerTool"
   2.905 -						AdditionalIncludeDirectories=""
   2.906 -						UsePrecompiledHeader="0"
   2.907 -					/>
   2.908 -				</FileConfiguration>
   2.909 -				<FileConfiguration
   2.910 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   2.911 -					>
   2.912 -					<Tool
   2.913 -						Name="VCCLCompilerTool"
   2.914 -						AdditionalIncludeDirectories=""
   2.915 -						UsePrecompiledHeader="0"
   2.916 -					/>
   2.917 -				</FileConfiguration>
   2.918 -				<FileConfiguration
   2.919 -					Name="Release|Smartphone 2003 (ARMV4)"
   2.920 -					>
   2.921 -					<Tool
   2.922 -						Name="VCCLCompilerTool"
   2.923 -						AdditionalIncludeDirectories=""
   2.924 -						UsePrecompiledHeader="0"
   2.925 -					/>
   2.926 -				</FileConfiguration>
   2.927 -				<FileConfiguration
   2.928 -					Name="Release|Pocket PC 2003 (ARMV4)"
   2.929 -					>
   2.930 -					<Tool
   2.931 -						Name="VCCLCompilerTool"
   2.932 -						AdditionalIncludeDirectories=""
   2.933 -						UsePrecompiledHeader="0"
   2.934 -					/>
   2.935 -				</FileConfiguration>
   2.936 -				<FileConfiguration
   2.937 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   2.938 -					>
   2.939 -					<Tool
   2.940 -						Name="VCCLCompilerTool"
   2.941 -						AdditionalIncludeDirectories=""
   2.942 -						UsePrecompiledHeader="0"
   2.943 -					/>
   2.944 -				</FileConfiguration>
   2.945  			</File>
   2.946  			<File
   2.947 -				RelativePath="..\..\src\video\SDL_cursor.c"
   2.948 +				RelativePath="..\..\src\video\windows\SDL_d3drender.c"
   2.949  				>
   2.950 -				<FileConfiguration
   2.951 -					Name="Debug|Smartphone 2003 (ARMV4)"
   2.952 -					>
   2.953 -					<Tool
   2.954 -						Name="VCCLCompilerTool"
   2.955 -						AdditionalIncludeDirectories=""
   2.956 -						UsePrecompiledHeader="0"
   2.957 -					/>
   2.958 -				</FileConfiguration>
   2.959 -				<FileConfiguration
   2.960 -					Name="Debug|Pocket PC 2003 (ARMV4)"
   2.961 -					>
   2.962 -					<Tool
   2.963 -						Name="VCCLCompilerTool"
   2.964 -						AdditionalIncludeDirectories=""
   2.965 -						UsePrecompiledHeader="0"
   2.966 -					/>
   2.967 -				</FileConfiguration>
   2.968 -				<FileConfiguration
   2.969 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   2.970 -					>
   2.971 -					<Tool
   2.972 -						Name="VCCLCompilerTool"
   2.973 -						AdditionalIncludeDirectories=""
   2.974 -						UsePrecompiledHeader="0"
   2.975 -					/>
   2.976 -				</FileConfiguration>
   2.977 -				<FileConfiguration
   2.978 -					Name="Release|Smartphone 2003 (ARMV4)"
   2.979 -					>
   2.980 -					<Tool
   2.981 -						Name="VCCLCompilerTool"
   2.982 -						AdditionalIncludeDirectories=""
   2.983 -						UsePrecompiledHeader="0"
   2.984 -					/>
   2.985 -				</FileConfiguration>
   2.986 -				<FileConfiguration
   2.987 -					Name="Release|Pocket PC 2003 (ARMV4)"
   2.988 -					>
   2.989 -					<Tool
   2.990 -						Name="VCCLCompilerTool"
   2.991 -						AdditionalIncludeDirectories=""
   2.992 -						UsePrecompiledHeader="0"
   2.993 -					/>
   2.994 -				</FileConfiguration>
   2.995 -				<FileConfiguration
   2.996 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   2.997 -					>
   2.998 -					<Tool
   2.999 -						Name="VCCLCompilerTool"
  2.1000 -						AdditionalIncludeDirectories=""
  2.1001 -						UsePrecompiledHeader="0"
  2.1002 -					/>
  2.1003 -				</FileConfiguration>
  2.1004  			</File>
  2.1005  			<File
  2.1006  				RelativePath="..\..\src\audio\windib\SDL_dibaudio.c"
  2.1007  				>
  2.1008 -				<FileConfiguration
  2.1009 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.1010 -					>
  2.1011 -					<Tool
  2.1012 -						Name="VCCLCompilerTool"
  2.1013 -						AdditionalIncludeDirectories=""
  2.1014 -						UsePrecompiledHeader="0"
  2.1015 -					/>
  2.1016 -				</FileConfiguration>
  2.1017 -				<FileConfiguration
  2.1018 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.1019 -					>
  2.1020 -					<Tool
  2.1021 -						Name="VCCLCompilerTool"
  2.1022 -						AdditionalIncludeDirectories=""
  2.1023 -						UsePrecompiledHeader="0"
  2.1024 -					/>
  2.1025 -				</FileConfiguration>
  2.1026 -				<FileConfiguration
  2.1027 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1028 -					>
  2.1029 -					<Tool
  2.1030 -						Name="VCCLCompilerTool"
  2.1031 -						AdditionalIncludeDirectories=""
  2.1032 -						UsePrecompiledHeader="0"
  2.1033 -					/>
  2.1034 -				</FileConfiguration>
  2.1035 -				<FileConfiguration
  2.1036 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.1037 -					>
  2.1038 -					<Tool
  2.1039 -						Name="VCCLCompilerTool"
  2.1040 -						AdditionalIncludeDirectories=""
  2.1041 -						UsePrecompiledHeader="0"
  2.1042 -					/>
  2.1043 -				</FileConfiguration>
  2.1044 -				<FileConfiguration
  2.1045 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.1046 -					>
  2.1047 -					<Tool
  2.1048 -						Name="VCCLCompilerTool"
  2.1049 -						AdditionalIncludeDirectories=""
  2.1050 -						UsePrecompiledHeader="0"
  2.1051 -					/>
  2.1052 -				</FileConfiguration>
  2.1053 -				<FileConfiguration
  2.1054 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1055 -					>
  2.1056 -					<Tool
  2.1057 -						Name="VCCLCompilerTool"
  2.1058 -						AdditionalIncludeDirectories=""
  2.1059 -						UsePrecompiledHeader="0"
  2.1060 -					/>
  2.1061 -				</FileConfiguration>
  2.1062 -			</File>
  2.1063 -			<File
  2.1064 -				RelativePath="..\..\src\video\windib\SDL_dibevents.c"
  2.1065 -				>
  2.1066 -				<FileConfiguration
  2.1067 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.1068 -					>
  2.1069 -					<Tool
  2.1070 -						Name="VCCLCompilerTool"
  2.1071 -						AdditionalIncludeDirectories=""
  2.1072 -						UsePrecompiledHeader="0"
  2.1073 -					/>
  2.1074 -				</FileConfiguration>
  2.1075 -				<FileConfiguration
  2.1076 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.1077 -					>
  2.1078 -					<Tool
  2.1079 -						Name="VCCLCompilerTool"
  2.1080 -						AdditionalIncludeDirectories=""
  2.1081 -						UsePrecompiledHeader="0"
  2.1082 -					/>
  2.1083 -				</FileConfiguration>
  2.1084 -				<FileConfiguration
  2.1085 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1086 -					>
  2.1087 -					<Tool
  2.1088 -						Name="VCCLCompilerTool"
  2.1089 -						AdditionalIncludeDirectories=""
  2.1090 -						UsePrecompiledHeader="0"
  2.1091 -					/>
  2.1092 -				</FileConfiguration>
  2.1093 -				<FileConfiguration
  2.1094 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.1095 -					>
  2.1096 -					<Tool
  2.1097 -						Name="VCCLCompilerTool"
  2.1098 -						AdditionalIncludeDirectories=""
  2.1099 -						UsePrecompiledHeader="0"
  2.1100 -					/>
  2.1101 -				</FileConfiguration>
  2.1102 -				<FileConfiguration
  2.1103 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.1104 -					>
  2.1105 -					<Tool
  2.1106 -						Name="VCCLCompilerTool"
  2.1107 -						AdditionalIncludeDirectories=""
  2.1108 -						UsePrecompiledHeader="0"
  2.1109 -					/>
  2.1110 -				</FileConfiguration>
  2.1111 -				<FileConfiguration
  2.1112 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1113 -					>
  2.1114 -					<Tool
  2.1115 -						Name="VCCLCompilerTool"
  2.1116 -						AdditionalIncludeDirectories=""
  2.1117 -						UsePrecompiledHeader="0"
  2.1118 -					/>
  2.1119 -				</FileConfiguration>
  2.1120 -			</File>
  2.1121 -			<File
  2.1122 -				RelativePath="..\..\src\video\windib\SDL_dibvideo.c"
  2.1123 -				>
  2.1124 -				<FileConfiguration
  2.1125 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.1126 -					>
  2.1127 -					<Tool
  2.1128 -						Name="VCCLCompilerTool"
  2.1129 -						AdditionalIncludeDirectories=""
  2.1130 -						UsePrecompiledHeader="0"
  2.1131 -					/>
  2.1132 -				</FileConfiguration>
  2.1133 -				<FileConfiguration
  2.1134 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.1135 -					>
  2.1136 -					<Tool
  2.1137 -						Name="VCCLCompilerTool"
  2.1138 -						AdditionalIncludeDirectories=""
  2.1139 -						UsePrecompiledHeader="0"
  2.1140 -					/>
  2.1141 -				</FileConfiguration>
  2.1142 -				<FileConfiguration
  2.1143 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1144 -					>
  2.1145 -					<Tool
  2.1146 -						Name="VCCLCompilerTool"
  2.1147 -						AdditionalIncludeDirectories=""
  2.1148 -						UsePrecompiledHeader="0"
  2.1149 -					/>
  2.1150 -				</FileConfiguration>
  2.1151 -				<FileConfiguration
  2.1152 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.1153 -					>
  2.1154 -					<Tool
  2.1155 -						Name="VCCLCompilerTool"
  2.1156 -						AdditionalIncludeDirectories=""
  2.1157 -						UsePrecompiledHeader="0"
  2.1158 -					/>
  2.1159 -				</FileConfiguration>
  2.1160 -				<FileConfiguration
  2.1161 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.1162 -					>
  2.1163 -					<Tool
  2.1164 -						Name="VCCLCompilerTool"
  2.1165 -						AdditionalIncludeDirectories=""
  2.1166 -						UsePrecompiledHeader="0"
  2.1167 -					/>
  2.1168 -				</FileConfiguration>
  2.1169 -				<FileConfiguration
  2.1170 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1171 -					>
  2.1172 -					<Tool
  2.1173 -						Name="VCCLCompilerTool"
  2.1174 -						AdditionalIncludeDirectories=""
  2.1175 -						UsePrecompiledHeader="0"
  2.1176 -					/>
  2.1177 -				</FileConfiguration>
  2.1178  			</File>
  2.1179  			<File
  2.1180  				RelativePath="..\..\src\audio\disk\SDL_diskaudio.c"
  2.1181  				>
  2.1182  			</File>
  2.1183  			<File
  2.1184 +				RelativePath="..\..\src\video\SDL_drawline.c"
  2.1185 +				>
  2.1186 +			</File>
  2.1187 +			<File
  2.1188 +				RelativePath="..\..\src\video\SDL_drawpoint.c"
  2.1189 +				>
  2.1190 +			</File>
  2.1191 +			<File
  2.1192 +				RelativePath="..\..\src\video\SDL_drawrect.c"
  2.1193 +				>
  2.1194 +			</File>
  2.1195 +			<File
  2.1196  				RelativePath="..\..\src\audio\dummy\SDL_dummyaudio.c"
  2.1197  				>
  2.1198  			</File>
  2.1199  			<File
  2.1200  				RelativePath="..\..\src\SDL_error.c"
  2.1201  				>
  2.1202 -				<FileConfiguration
  2.1203 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.1204 -					>
  2.1205 -					<Tool
  2.1206 -						Name="VCCLCompilerTool"
  2.1207 -						AdditionalIncludeDirectories=""
  2.1208 -						UsePrecompiledHeader="0"
  2.1209 -					/>
  2.1210 -				</FileConfiguration>
  2.1211 -				<FileConfiguration
  2.1212 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.1213 -					>
  2.1214 -					<Tool
  2.1215 -						Name="VCCLCompilerTool"
  2.1216 -						AdditionalIncludeDirectories=""
  2.1217 -						UsePrecompiledHeader="0"
  2.1218 -					/>
  2.1219 -				</FileConfiguration>
  2.1220 -				<FileConfiguration
  2.1221 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1222 -					>
  2.1223 -					<Tool
  2.1224 -						Name="VCCLCompilerTool"
  2.1225 -						AdditionalIncludeDirectories=""
  2.1226 -						UsePrecompiledHeader="0"
  2.1227 -					/>
  2.1228 -				</FileConfiguration>
  2.1229 -				<FileConfiguration
  2.1230 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.1231 -					>
  2.1232 -					<Tool
  2.1233 -						Name="VCCLCompilerTool"
  2.1234 -						AdditionalIncludeDirectories=""
  2.1235 -						UsePrecompiledHeader="0"
  2.1236 -					/>
  2.1237 -				</FileConfiguration>
  2.1238 -				<FileConfiguration
  2.1239 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.1240 -					>
  2.1241 -					<Tool
  2.1242 -						Name="VCCLCompilerTool"
  2.1243 -						AdditionalIncludeDirectories=""
  2.1244 -						UsePrecompiledHeader="0"
  2.1245 -					/>
  2.1246 -				</FileConfiguration>
  2.1247 -				<FileConfiguration
  2.1248 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1249 -					>
  2.1250 -					<Tool
  2.1251 -						Name="VCCLCompilerTool"
  2.1252 -						AdditionalIncludeDirectories=""
  2.1253 -						UsePrecompiledHeader="0"
  2.1254 -					/>
  2.1255 -				</FileConfiguration>
  2.1256  			</File>
  2.1257  			<File
  2.1258  				RelativePath="..\..\src\events\SDL_events.c"
  2.1259  				>
  2.1260 -				<FileConfiguration
  2.1261 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.1262 -					>
  2.1263 -					<Tool
  2.1264 -						Name="VCCLCompilerTool"
  2.1265 -						AdditionalIncludeDirectories=""
  2.1266 -						UsePrecompiledHeader="0"
  2.1267 -					/>
  2.1268 -				</FileConfiguration>
  2.1269 -				<FileConfiguration
  2.1270 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.1271 -					>
  2.1272 -					<Tool
  2.1273 -						Name="VCCLCompilerTool"
  2.1274 -						AdditionalIncludeDirectories=""
  2.1275 -						UsePrecompiledHeader="0"
  2.1276 -					/>
  2.1277 -				</FileConfiguration>
  2.1278 -				<FileConfiguration
  2.1279 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1280 -					>
  2.1281 -					<Tool
  2.1282 -						Name="VCCLCompilerTool"
  2.1283 -						AdditionalIncludeDirectories=""
  2.1284 -						UsePrecompiledHeader="0"
  2.1285 -					/>
  2.1286 -				</FileConfiguration>
  2.1287 -				<FileConfiguration
  2.1288 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.1289 -					>
  2.1290 -					<Tool
  2.1291 -						Name="VCCLCompilerTool"
  2.1292 -						AdditionalIncludeDirectories=""
  2.1293 -						UsePrecompiledHeader="0"
  2.1294 -					/>
  2.1295 -				</FileConfiguration>
  2.1296 -				<FileConfiguration
  2.1297 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.1298 -					>
  2.1299 -					<Tool
  2.1300 -						Name="VCCLCompilerTool"
  2.1301 -						AdditionalIncludeDirectories=""
  2.1302 -						UsePrecompiledHeader="0"
  2.1303 -					/>
  2.1304 -				</FileConfiguration>
  2.1305 -				<FileConfiguration
  2.1306 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1307 -					>
  2.1308 -					<Tool
  2.1309 -						Name="VCCLCompilerTool"
  2.1310 -						AdditionalIncludeDirectories=""
  2.1311 -						UsePrecompiledHeader="0"
  2.1312 -					/>
  2.1313 -				</FileConfiguration>
  2.1314 -			</File>
  2.1315 -			<File
  2.1316 -				RelativePath="..\..\src\events\SDL_expose.c"
  2.1317 -				>
  2.1318 -				<FileConfiguration
  2.1319 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.1320 -					>
  2.1321 -					<Tool
  2.1322 -						Name="VCCLCompilerTool"
  2.1323 -						AdditionalIncludeDirectories=""
  2.1324 -						UsePrecompiledHeader="0"
  2.1325 -					/>
  2.1326 -				</FileConfiguration>
  2.1327 -				<FileConfiguration
  2.1328 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.1329 -					>
  2.1330 -					<Tool
  2.1331 -						Name="VCCLCompilerTool"
  2.1332 -						AdditionalIncludeDirectories=""
  2.1333 -						UsePrecompiledHeader="0"
  2.1334 -					/>
  2.1335 -				</FileConfiguration>
  2.1336 -				<FileConfiguration
  2.1337 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1338 -					>
  2.1339 -					<Tool
  2.1340 -						Name="VCCLCompilerTool"
  2.1341 -						AdditionalIncludeDirectories=""
  2.1342 -						UsePrecompiledHeader="0"
  2.1343 -					/>
  2.1344 -				</FileConfiguration>
  2.1345 -				<FileConfiguration
  2.1346 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.1347 -					>
  2.1348 -					<Tool
  2.1349 -						Name="VCCLCompilerTool"
  2.1350 -						AdditionalIncludeDirectories=""
  2.1351 -						UsePrecompiledHeader="0"
  2.1352 -					/>
  2.1353 -				</FileConfiguration>
  2.1354 -				<FileConfiguration
  2.1355 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.1356 -					>
  2.1357 -					<Tool
  2.1358 -						Name="VCCLCompilerTool"
  2.1359 -						AdditionalIncludeDirectories=""
  2.1360 -						UsePrecompiledHeader="0"
  2.1361 -					/>
  2.1362 -				</FileConfiguration>
  2.1363 -				<FileConfiguration
  2.1364 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1365 -					>
  2.1366 -					<Tool
  2.1367 -						Name="VCCLCompilerTool"
  2.1368 -						AdditionalIncludeDirectories=""
  2.1369 -						UsePrecompiledHeader="0"
  2.1370 -					/>
  2.1371 -				</FileConfiguration>
  2.1372  			</File>
  2.1373  			<File
  2.1374  				RelativePath="..\..\src\SDL_fatal.c"
  2.1375  				>
  2.1376 -				<FileConfiguration
  2.1377 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.1378 -					>
  2.1379 -					<Tool
  2.1380 -						Name="VCCLCompilerTool"
  2.1381 -						AdditionalIncludeDirectories=""
  2.1382 -						UsePrecompiledHeader="0"
  2.1383 -					/>
  2.1384 -				</FileConfiguration>
  2.1385 -				<FileConfiguration
  2.1386 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.1387 -					>
  2.1388 -					<Tool
  2.1389 -						Name="VCCLCompilerTool"
  2.1390 -						AdditionalIncludeDirectories=""
  2.1391 -						UsePrecompiledHeader="0"
  2.1392 -					/>
  2.1393 -				</FileConfiguration>
  2.1394 -				<FileConfiguration
  2.1395 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1396 -					>
  2.1397 -					<Tool
  2.1398 -						Name="VCCLCompilerTool"
  2.1399 -						AdditionalIncludeDirectories=""
  2.1400 -						UsePrecompiledHeader="0"
  2.1401 -					/>
  2.1402 -				</FileConfiguration>
  2.1403 -				<FileConfiguration
  2.1404 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.1405 -					>
  2.1406 -					<Tool
  2.1407 -						Name="VCCLCompilerTool"
  2.1408 -						AdditionalIncludeDirectories=""
  2.1409 -						UsePrecompiledHeader="0"
  2.1410 -					/>
  2.1411 -				</FileConfiguration>
  2.1412 -				<FileConfiguration
  2.1413 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.1414 -					>
  2.1415 -					<Tool
  2.1416 -						Name="VCCLCompilerTool"
  2.1417 -						AdditionalIncludeDirectories=""
  2.1418 -						UsePrecompiledHeader="0"
  2.1419 -					/>
  2.1420 -				</FileConfiguration>
  2.1421 -				<FileConfiguration
  2.1422 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1423 -					>
  2.1424 -					<Tool
  2.1425 -						Name="VCCLCompilerTool"
  2.1426 -						AdditionalIncludeDirectories=""
  2.1427 -						UsePrecompiledHeader="0"
  2.1428 -					/>
  2.1429 -				</FileConfiguration>
  2.1430 +			</File>
  2.1431 +			<File
  2.1432 +				RelativePath="..\..\src\video\SDL_fillrect.c"
  2.1433 +				>
  2.1434  			</File>
  2.1435  			<File
  2.1436  				RelativePath="..\..\src\video\SDL_gamma.c"
  2.1437  				>
  2.1438 -				<FileConfiguration
  2.1439 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.1440 -					>
  2.1441 -					<Tool
  2.1442 -						Name="VCCLCompilerTool"
  2.1443 -						AdditionalIncludeDirectories=""
  2.1444 -						UsePrecompiledHeader="0"
  2.1445 -					/>
  2.1446 -				</FileConfiguration>
  2.1447 -				<FileConfiguration
  2.1448 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.1449 -					>
  2.1450 -					<Tool
  2.1451 -						Name="VCCLCompilerTool"
  2.1452 -						AdditionalIncludeDirectories=""
  2.1453 -						UsePrecompiledHeader="0"
  2.1454 -					/>
  2.1455 -				</FileConfiguration>
  2.1456 -				<FileConfiguration
  2.1457 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1458 -					>
  2.1459 -					<Tool
  2.1460 -						Name="VCCLCompilerTool"
  2.1461 -						AdditionalIncludeDirectories=""
  2.1462 -						UsePrecompiledHeader="0"
  2.1463 -					/>
  2.1464 -				</FileConfiguration>
  2.1465 -				<FileConfiguration
  2.1466 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.1467 -					>
  2.1468 -					<Tool
  2.1469 -						Name="VCCLCompilerTool"
  2.1470 -						AdditionalIncludeDirectories=""
  2.1471 -						UsePrecompiledHeader="0"
  2.1472 -					/>
  2.1473 -				</FileConfiguration>
  2.1474 -				<FileConfiguration
  2.1475 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.1476 -					>
  2.1477 -					<Tool
  2.1478 -						Name="VCCLCompilerTool"
  2.1479 -						AdditionalIncludeDirectories=""
  2.1480 -						UsePrecompiledHeader="0"
  2.1481 -					/>
  2.1482 -				</FileConfiguration>
  2.1483 -				<FileConfiguration
  2.1484 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1485 -					>
  2.1486 -					<Tool
  2.1487 -						Name="VCCLCompilerTool"
  2.1488 -						AdditionalIncludeDirectories=""
  2.1489 -						UsePrecompiledHeader="0"
  2.1490 -					/>
  2.1491 -				</FileConfiguration>
  2.1492  			</File>
  2.1493  			<File
  2.1494 -				RelativePath="..\..\src\video\gapi\sdl_gapivideo.c"
  2.1495 +				RelativePath="..\..\src\video\windows\SDL_gapirender.c"
  2.1496  				>
  2.1497 -				<FileConfiguration
  2.1498 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.1499 -					>
  2.1500 -					<Tool
  2.1501 -						Name="VCCLCompilerTool"
  2.1502 -						AdditionalIncludeDirectories=""
  2.1503 -						UsePrecompiledHeader="0"
  2.1504 -					/>
  2.1505 -				</FileConfiguration>
  2.1506 -				<FileConfiguration
  2.1507 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.1508 -					>
  2.1509 -					<Tool
  2.1510 -						Name="VCCLCompilerTool"
  2.1511 -						AdditionalIncludeDirectories=""
  2.1512 -						UsePrecompiledHeader="0"
  2.1513 -					/>
  2.1514 -				</FileConfiguration>
  2.1515 -				<FileConfiguration
  2.1516 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1517 -					>
  2.1518 -					<Tool
  2.1519 -						Name="VCCLCompilerTool"
  2.1520 -						AdditionalIncludeDirectories=""
  2.1521 -						UsePrecompiledHeader="0"
  2.1522 -					/>
  2.1523 -				</FileConfiguration>
  2.1524 -				<FileConfiguration
  2.1525 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.1526 -					>
  2.1527 -					<Tool
  2.1528 -						Name="VCCLCompilerTool"
  2.1529 -						AdditionalIncludeDirectories=""
  2.1530 -						UsePrecompiledHeader="0"
  2.1531 -					/>
  2.1532 -				</FileConfiguration>
  2.1533 -				<FileConfiguration
  2.1534 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.1535 -					>
  2.1536 -					<Tool
  2.1537 -						Name="VCCLCompilerTool"
  2.1538 -						AdditionalIncludeDirectories=""
  2.1539 -						UsePrecompiledHeader="0"
  2.1540 -					/>
  2.1541 -				</FileConfiguration>
  2.1542 -				<FileConfiguration
  2.1543 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1544 -					>
  2.1545 -					<Tool
  2.1546 -						Name="VCCLCompilerTool"
  2.1547 -						AdditionalIncludeDirectories=""
  2.1548 -						UsePrecompiledHeader="0"
  2.1549 -					/>
  2.1550 -				</FileConfiguration>
  2.1551 +			</File>
  2.1552 +			<File
  2.1553 +				RelativePath="..\..\src\video\windows\SDL_gdirender.c"
  2.1554 +				>
  2.1555 +			</File>
  2.1556 +			<File
  2.1557 +				RelativePath="..\..\src\events\SDL_gesture.c"
  2.1558 +				>
  2.1559  			</File>
  2.1560  			<File
  2.1561  				RelativePath="..\..\src\stdlib\SDL_getenv.c"
  2.1562  				>
  2.1563  			</File>
  2.1564  			<File
  2.1565 +				RelativePath="..\..\src\haptic\SDL_haptic.c"
  2.1566 +				>
  2.1567 +			</File>
  2.1568 +			<File
  2.1569  				RelativePath="..\..\src\stdlib\SDL_iconv.c"
  2.1570  				>
  2.1571  			</File>
  2.1572 @@ -1941,60 +916,6 @@
  2.1573  			<File
  2.1574  				RelativePath="..\..\src\events\SDL_keyboard.c"
  2.1575  				>
  2.1576 -				<FileConfiguration
  2.1577 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.1578 -					>
  2.1579 -					<Tool
  2.1580 -						Name="VCCLCompilerTool"
  2.1581 -						AdditionalIncludeDirectories=""
  2.1582 -						UsePrecompiledHeader="0"
  2.1583 -					/>
  2.1584 -				</FileConfiguration>
  2.1585 -				<FileConfiguration
  2.1586 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.1587 -					>
  2.1588 -					<Tool
  2.1589 -						Name="VCCLCompilerTool"
  2.1590 -						AdditionalIncludeDirectories=""
  2.1591 -						UsePrecompiledHeader="0"
  2.1592 -					/>
  2.1593 -				</FileConfiguration>
  2.1594 -				<FileConfiguration
  2.1595 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1596 -					>
  2.1597 -					<Tool
  2.1598 -						Name="VCCLCompilerTool"
  2.1599 -						AdditionalIncludeDirectories=""
  2.1600 -						UsePrecompiledHeader="0"
  2.1601 -					/>
  2.1602 -				</FileConfiguration>
  2.1603 -				<FileConfiguration
  2.1604 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.1605 -					>
  2.1606 -					<Tool
  2.1607 -						Name="VCCLCompilerTool"
  2.1608 -						AdditionalIncludeDirectories=""
  2.1609 -						UsePrecompiledHeader="0"
  2.1610 -					/>
  2.1611 -				</FileConfiguration>
  2.1612 -				<FileConfiguration
  2.1613 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.1614 -					>
  2.1615 -					<Tool
  2.1616 -						Name="VCCLCompilerTool"
  2.1617 -						AdditionalIncludeDirectories=""
  2.1618 -						UsePrecompiledHeader="0"
  2.1619 -					/>
  2.1620 -				</FileConfiguration>
  2.1621 -				<FileConfiguration
  2.1622 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1623 -					>
  2.1624 -					<Tool
  2.1625 -						Name="VCCLCompilerTool"
  2.1626 -						AdditionalIncludeDirectories=""
  2.1627 -						UsePrecompiledHeader="0"
  2.1628 -					/>
  2.1629 -				</FileConfiguration>
  2.1630  			</File>
  2.1631  			<File
  2.1632  				RelativePath="..\..\src\stdlib\SDL_malloc.c"
  2.1633 @@ -2003,183 +924,17 @@
  2.1634  			<File
  2.1635  				RelativePath="..\..\src\audio\SDL_mixer.c"
  2.1636  				>
  2.1637 -				<FileConfiguration
  2.1638 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.1639 -					>
  2.1640 -					<Tool
  2.1641 -						Name="VCCLCompilerTool"
  2.1642 -						AdditionalIncludeDirectories=""
  2.1643 -						UsePrecompiledHeader="0"
  2.1644 -					/>
  2.1645 -				</FileConfiguration>
  2.1646 -				<FileConfiguration
  2.1647 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.1648 -					>
  2.1649 -					<Tool
  2.1650 -						Name="VCCLCompilerTool"
  2.1651 -						AdditionalIncludeDirectories=""
  2.1652 -						UsePrecompiledHeader="0"
  2.1653 -					/>
  2.1654 -				</FileConfiguration>
  2.1655 -				<FileConfiguration
  2.1656 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1657 -					>
  2.1658 -					<Tool
  2.1659 -						Name="VCCLCompilerTool"
  2.1660 -						AdditionalIncludeDirectories=""
  2.1661 -						UsePrecompiledHeader="0"
  2.1662 -					/>
  2.1663 -				</FileConfiguration>
  2.1664 -				<FileConfiguration
  2.1665 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.1666 -					>
  2.1667 -					<Tool
  2.1668 -						Name="VCCLCompilerTool"
  2.1669 -						AdditionalIncludeDirectories=""
  2.1670 -						UsePrecompiledHeader="0"
  2.1671 -					/>
  2.1672 -				</FileConfiguration>
  2.1673 -				<FileConfiguration
  2.1674 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.1675 -					>
  2.1676 -					<Tool
  2.1677 -						Name="VCCLCompilerTool"
  2.1678 -						AdditionalIncludeDirectories=""
  2.1679 -						UsePrecompiledHeader="0"
  2.1680 -					/>
  2.1681 -				</FileConfiguration>
  2.1682 -				<FileConfiguration
  2.1683 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1684 -					>
  2.1685 -					<Tool
  2.1686 -						Name="VCCLCompilerTool"
  2.1687 -						AdditionalIncludeDirectories=""
  2.1688 -						UsePrecompiledHeader="0"
  2.1689 -					/>
  2.1690 -				</FileConfiguration>
  2.1691 -			</File>
  2.1692 -			<File
  2.1693 -				RelativePath="..\..\src\audio\SDL_mixer_MMX_VC.c"
  2.1694 -				>
  2.1695 -				<FileConfiguration
  2.1696 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.1697 -					>
  2.1698 -					<Tool
  2.1699 -						Name="VCCLCompilerTool"
  2.1700 -						AdditionalIncludeDirectories=""
  2.1701 -						UsePrecompiledHeader="0"
  2.1702 -					/>
  2.1703 -				</FileConfiguration>
  2.1704 -				<FileConfiguration
  2.1705 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.1706 -					>
  2.1707 -					<Tool
  2.1708 -						Name="VCCLCompilerTool"
  2.1709 -						AdditionalIncludeDirectories=""
  2.1710 -						UsePrecompiledHeader="0"
  2.1711 -					/>
  2.1712 -				</FileConfiguration>
  2.1713 -				<FileConfiguration
  2.1714 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1715 -					>
  2.1716 -					<Tool
  2.1717 -						Name="VCCLCompilerTool"
  2.1718 -						AdditionalIncludeDirectories=""
  2.1719 -						UsePrecompiledHeader="0"
  2.1720 -					/>
  2.1721 -				</FileConfiguration>
  2.1722 -				<FileConfiguration
  2.1723 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.1724 -					>
  2.1725 -					<Tool
  2.1726 -						Name="VCCLCompilerTool"
  2.1727 -						AdditionalIncludeDirectories=""
  2.1728 -						UsePrecompiledHeader="0"
  2.1729 -					/>
  2.1730 -				</FileConfiguration>
  2.1731 -				<FileConfiguration
  2.1732 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.1733 -					>
  2.1734 -					<Tool
  2.1735 -						Name="VCCLCompilerTool"
  2.1736 -						AdditionalIncludeDirectories=""
  2.1737 -						UsePrecompiledHeader="0"
  2.1738 -					/>
  2.1739 -				</FileConfiguration>
  2.1740 -				<FileConfiguration
  2.1741 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1742 -					>
  2.1743 -					<Tool
  2.1744 -						Name="VCCLCompilerTool"
  2.1745 -						AdditionalIncludeDirectories=""
  2.1746 -						UsePrecompiledHeader="0"
  2.1747 -					/>
  2.1748 -				</FileConfiguration>
  2.1749  			</File>
  2.1750  			<File
  2.1751  				RelativePath="..\..\src\events\SDL_mouse.c"
  2.1752  				>
  2.1753 -				<FileConfiguration
  2.1754 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.1755 -					>
  2.1756 -					<Tool
  2.1757 -						Name="VCCLCompilerTool"
  2.1758 -						AdditionalIncludeDirectories=""
  2.1759 -						UsePrecompiledHeader="0"
  2.1760 -					/>
  2.1761 -				</FileConfiguration>
  2.1762 -				<FileConfiguration
  2.1763 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.1764 -					>
  2.1765 -					<Tool
  2.1766 -						Name="VCCLCompilerTool"
  2.1767 -						AdditionalIncludeDirectories=""
  2.1768 -						UsePrecompiledHeader="0"
  2.1769 -					/>
  2.1770 -				</FileConfiguration>
  2.1771 -				<FileConfiguration
  2.1772 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1773 -					>
  2.1774 -					<Tool
  2.1775 -						Name="VCCLCompilerTool"
  2.1776 -						AdditionalIncludeDirectories=""
  2.1777 -						UsePrecompiledHeader="0"
  2.1778 -					/>
  2.1779 -				</FileConfiguration>
  2.1780 -				<FileConfiguration
  2.1781 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.1782 -					>
  2.1783 -					<Tool
  2.1784 -						Name="VCCLCompilerTool"
  2.1785 -						AdditionalIncludeDirectories=""
  2.1786 -						UsePrecompiledHeader="0"
  2.1787 -					/>
  2.1788 -				</FileConfiguration>
  2.1789 -				<FileConfiguration
  2.1790 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.1791 -					>
  2.1792 -					<Tool
  2.1793 -						Name="VCCLCompilerTool"
  2.1794 -						AdditionalIncludeDirectories=""
  2.1795 -						UsePrecompiledHeader="0"
  2.1796 -					/>
  2.1797 -				</FileConfiguration>
  2.1798 -				<FileConfiguration
  2.1799 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1800 -					>
  2.1801 -					<Tool
  2.1802 -						Name="VCCLCompilerTool"
  2.1803 -						AdditionalIncludeDirectories=""
  2.1804 -						UsePrecompiledHeader="0"
  2.1805 -					/>
  2.1806 -				</FileConfiguration>
  2.1807  			</File>
  2.1808  			<File
  2.1809  				RelativePath="..\..\src\video\dummy\SDL_nullevents.c"
  2.1810  				>
  2.1811  			</File>
  2.1812  			<File
  2.1813 -				RelativePath="..\..\src\video\dummy\SDL_nullmouse.c"
  2.1814 +				RelativePath="..\..\src\video\dummy\SDL_nullrender.c"
  2.1815  				>
  2.1816  			</File>
  2.1817  			<File
  2.1818 @@ -2189,60 +944,10 @@
  2.1819  			<File
  2.1820  				RelativePath="..\..\src\video\SDL_pixels.c"
  2.1821  				>
  2.1822 -				<FileConfiguration
  2.1823 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.1824 -					>
  2.1825 -					<Tool
  2.1826 -						Name="VCCLCompilerTool"
  2.1827 -						AdditionalIncludeDirectories=""
  2.1828 -						UsePrecompiledHeader="0"
  2.1829 -					/>
  2.1830 -				</FileConfiguration>
  2.1831 -				<FileConfiguration
  2.1832 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.1833 -					>
  2.1834 -					<Tool
  2.1835 -						Name="VCCLCompilerTool"
  2.1836 -						AdditionalIncludeDirectories=""
  2.1837 -						UsePrecompiledHeader="0"
  2.1838 -					/>
  2.1839 -				</FileConfiguration>
  2.1840 -				<FileConfiguration
  2.1841 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1842 -					>
  2.1843 -					<Tool
  2.1844 -						Name="VCCLCompilerTool"
  2.1845 -						AdditionalIncludeDirectories=""
  2.1846 -						UsePrecompiledHeader="0"
  2.1847 -					/>
  2.1848 -				</FileConfiguration>
  2.1849 -				<FileConfiguration
  2.1850 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.1851 -					>
  2.1852 -					<Tool
  2.1853 -						Name="VCCLCompilerTool"
  2.1854 -						AdditionalIncludeDirectories=""
  2.1855 -						UsePrecompiledHeader="0"
  2.1856 -					/>
  2.1857 -				</FileConfiguration>
  2.1858 -				<FileConfiguration
  2.1859 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.1860 -					>
  2.1861 -					<Tool
  2.1862 -						Name="VCCLCompilerTool"
  2.1863 -						AdditionalIncludeDirectories=""
  2.1864 -						UsePrecompiledHeader="0"
  2.1865 -					/>
  2.1866 -				</FileConfiguration>
  2.1867 -				<FileConfiguration
  2.1868 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1869 -					>
  2.1870 -					<Tool
  2.1871 -						Name="VCCLCompilerTool"
  2.1872 -						AdditionalIncludeDirectories=""
  2.1873 -						UsePrecompiledHeader="0"
  2.1874 -					/>
  2.1875 -				</FileConfiguration>
  2.1876 +			</File>
  2.1877 +			<File
  2.1878 +				RelativePath="..\..\src\power\SDL_power.c"
  2.1879 +				>
  2.1880  			</File>
  2.1881  			<File
  2.1882  				RelativePath="..\..\src\stdlib\SDL_qsort.c"
  2.1883 @@ -2251,292 +956,38 @@
  2.1884  			<File
  2.1885  				RelativePath="..\..\src\events\SDL_quit.c"
  2.1886  				>
  2.1887 -				<FileConfiguration
  2.1888 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.1889 -					>
  2.1890 -					<Tool
  2.1891 -						Name="VCCLCompilerTool"
  2.1892 -						AdditionalIncludeDirectories=""
  2.1893 -						UsePrecompiledHeader="0"
  2.1894 -					/>
  2.1895 -				</FileConfiguration>
  2.1896 -				<FileConfiguration
  2.1897 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.1898 -					>
  2.1899 -					<Tool
  2.1900 -						Name="VCCLCompilerTool"
  2.1901 -						AdditionalIncludeDirectories=""
  2.1902 -						UsePrecompiledHeader="0"
  2.1903 -					/>
  2.1904 -				</FileConfiguration>
  2.1905 -				<FileConfiguration
  2.1906 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1907 -					>
  2.1908 -					<Tool
  2.1909 -						Name="VCCLCompilerTool"
  2.1910 -						AdditionalIncludeDirectories=""
  2.1911 -						UsePrecompiledHeader="0"
  2.1912 -					/>
  2.1913 -				</FileConfiguration>
  2.1914 -				<FileConfiguration
  2.1915 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.1916 -					>
  2.1917 -					<Tool
  2.1918 -						Name="VCCLCompilerTool"
  2.1919 -						AdditionalIncludeDirectories=""
  2.1920 -						UsePrecompiledHeader="0"
  2.1921 -					/>
  2.1922 -				</FileConfiguration>
  2.1923 -				<FileConfiguration
  2.1924 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.1925 -					>
  2.1926 -					<Tool
  2.1927 -						Name="VCCLCompilerTool"
  2.1928 -						AdditionalIncludeDirectories=""
  2.1929 -						UsePrecompiledHeader="0"
  2.1930 -					/>
  2.1931 -				</FileConfiguration>
  2.1932 -				<FileConfiguration
  2.1933 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1934 -					>
  2.1935 -					<Tool
  2.1936 -						Name="VCCLCompilerTool"
  2.1937 -						AdditionalIncludeDirectories=""
  2.1938 -						UsePrecompiledHeader="0"
  2.1939 -					/>
  2.1940 -				</FileConfiguration>
  2.1941  			</File>
  2.1942  			<File
  2.1943 -				RelativePath="..\..\src\events\SDL_resize.c"
  2.1944 +				RelativePath="..\..\src\video\SDL_rect.c"
  2.1945  				>
  2.1946 -				<FileConfiguration
  2.1947 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.1948 -					>
  2.1949 -					<Tool
  2.1950 -						Name="VCCLCompilerTool"
  2.1951 -						AdditionalIncludeDirectories=""
  2.1952 -						UsePrecompiledHeader="0"
  2.1953 -					/>
  2.1954 -				</FileConfiguration>
  2.1955 -				<FileConfiguration
  2.1956 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.1957 -					>
  2.1958 -					<Tool
  2.1959 -						Name="VCCLCompilerTool"
  2.1960 -						AdditionalIncludeDirectories=""
  2.1961 -						UsePrecompiledHeader="0"
  2.1962 -					/>
  2.1963 -				</FileConfiguration>
  2.1964 -				<FileConfiguration
  2.1965 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1966 -					>
  2.1967 -					<Tool
  2.1968 -						Name="VCCLCompilerTool"
  2.1969 -						AdditionalIncludeDirectories=""
  2.1970 -						UsePrecompiledHeader="0"
  2.1971 -					/>
  2.1972 -				</FileConfiguration>
  2.1973 -				<FileConfiguration
  2.1974 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.1975 -					>
  2.1976 -					<Tool
  2.1977 -						Name="VCCLCompilerTool"
  2.1978 -						AdditionalIncludeDirectories=""
  2.1979 -						UsePrecompiledHeader="0"
  2.1980 -					/>
  2.1981 -				</FileConfiguration>
  2.1982 -				<FileConfiguration
  2.1983 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.1984 -					>
  2.1985 -					<Tool
  2.1986 -						Name="VCCLCompilerTool"
  2.1987 -						AdditionalIncludeDirectories=""
  2.1988 -						UsePrecompiledHeader="0"
  2.1989 -					/>
  2.1990 -				</FileConfiguration>
  2.1991 -				<FileConfiguration
  2.1992 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.1993 -					>
  2.1994 -					<Tool
  2.1995 -						Name="VCCLCompilerTool"
  2.1996 -						AdditionalIncludeDirectories=""
  2.1997 -						UsePrecompiledHeader="0"
  2.1998 -					/>
  2.1999 -				</FileConfiguration>
  2.2000 +			</File>
  2.2001 +			<File
  2.2002 +				RelativePath="..\..\src\video\SDL_renderer_sw.c"
  2.2003 +				>
  2.2004  			</File>
  2.2005  			<File
  2.2006  				RelativePath="..\..\src\video\SDL_RLEaccel.c"
  2.2007  				>
  2.2008 -				<FileConfiguration
  2.2009 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.2010 -					>
  2.2011 -					<Tool
  2.2012 -						Name="VCCLCompilerTool"
  2.2013 -						AdditionalIncludeDirectories=""
  2.2014 -						UsePrecompiledHeader="0"
  2.2015 -					/>
  2.2016 -				</FileConfiguration>
  2.2017 -				<FileConfiguration
  2.2018 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.2019 -					>
  2.2020 -					<Tool
  2.2021 -						Name="VCCLCompilerTool"
  2.2022 -						AdditionalIncludeDirectories=""
  2.2023 -						UsePrecompiledHeader="0"
  2.2024 -					/>
  2.2025 -				</FileConfiguration>
  2.2026 -				<FileConfiguration
  2.2027 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2028 -					>
  2.2029 -					<Tool
  2.2030 -						Name="VCCLCompilerTool"
  2.2031 -						AdditionalIncludeDirectories=""
  2.2032 -						UsePrecompiledHeader="0"
  2.2033 -					/>
  2.2034 -				</FileConfiguration>
  2.2035 -				<FileConfiguration
  2.2036 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.2037 -					>
  2.2038 -					<Tool
  2.2039 -						Name="VCCLCompilerTool"
  2.2040 -						AdditionalIncludeDirectories=""
  2.2041 -						UsePrecompiledHeader="0"
  2.2042 -					/>
  2.2043 -				</FileConfiguration>
  2.2044 -				<FileConfiguration
  2.2045 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.2046 -					>
  2.2047 -					<Tool
  2.2048 -						Name="VCCLCompilerTool"
  2.2049 -						AdditionalIncludeDirectories=""
  2.2050 -						UsePrecompiledHeader="0"
  2.2051 -					/>
  2.2052 -				</FileConfiguration>
  2.2053 -				<FileConfiguration
  2.2054 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2055 -					>
  2.2056 -					<Tool
  2.2057 -						Name="VCCLCompilerTool"
  2.2058 -						AdditionalIncludeDirectories=""
  2.2059 -						UsePrecompiledHeader="0"
  2.2060 -					/>
  2.2061 -				</FileConfiguration>
  2.2062  			</File>
  2.2063  			<File
  2.2064  				RelativePath="..\..\src\file\SDL_rwops.c"
  2.2065  				>
  2.2066 -				<FileConfiguration
  2.2067 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.2068 -					>
  2.2069 -					<Tool
  2.2070 -						Name="VCCLCompilerTool"
  2.2071 -						AdditionalIncludeDirectories=""
  2.2072 -						UsePrecompiledHeader="0"
  2.2073 -					/>
  2.2074 -				</FileConfiguration>
  2.2075 -				<FileConfiguration
  2.2076 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.2077 -					>
  2.2078 -					<Tool
  2.2079 -						Name="VCCLCompilerTool"
  2.2080 -						AdditionalIncludeDirectories=""
  2.2081 -						UsePrecompiledHeader="0"
  2.2082 -					/>
  2.2083 -				</FileConfiguration>
  2.2084 -				<FileConfiguration
  2.2085 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2086 -					>
  2.2087 -					<Tool
  2.2088 -						Name="VCCLCompilerTool"
  2.2089 -						AdditionalIncludeDirectories=""
  2.2090 -						UsePrecompiledHeader="0"
  2.2091 -					/>
  2.2092 -				</FileConfiguration>
  2.2093 -				<FileConfiguration
  2.2094 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.2095 -					>
  2.2096 -					<Tool
  2.2097 -						Name="VCCLCompilerTool"
  2.2098 -						AdditionalIncludeDirectories=""
  2.2099 -						UsePrecompiledHeader="0"
  2.2100 -					/>
  2.2101 -				</FileConfiguration>
  2.2102 -				<FileConfiguration
  2.2103 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.2104 -					>
  2.2105 -					<Tool
  2.2106 -						Name="VCCLCompilerTool"
  2.2107 -						AdditionalIncludeDirectories=""
  2.2108 -						UsePrecompiledHeader="0"
  2.2109 -					/>
  2.2110 -				</FileConfiguration>
  2.2111 -				<FileConfiguration
  2.2112 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2113 -					>
  2.2114 -					<Tool
  2.2115 -						Name="VCCLCompilerTool"
  2.2116 -						AdditionalIncludeDirectories=""
  2.2117 -						UsePrecompiledHeader="0"
  2.2118 -					/>
  2.2119 -				</FileConfiguration>
  2.2120 +			</File>
  2.2121 +			<File
  2.2122 +				RelativePath="..\..\src\video\SDL_shape.c"
  2.2123 +				>
  2.2124 +			</File>
  2.2125 +			<File
  2.2126 +				RelativePath="..\..\src\atomic\SDL_spinlock.c"
  2.2127 +				>
  2.2128 +			</File>
  2.2129 +			<File
  2.2130 +				RelativePath="..\..\src\stdlib\SDL_stdlib.c"
  2.2131 +				>
  2.2132  			</File>
  2.2133  			<File
  2.2134  				RelativePath="..\..\src\video\SDL_stretch.c"
  2.2135  				>
  2.2136 -				<FileConfiguration
  2.2137 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.2138 -					>
  2.2139 -					<Tool
  2.2140 -						Name="VCCLCompilerTool"
  2.2141 -						AdditionalIncludeDirectories=""
  2.2142 -						UsePrecompiledHeader="0"
  2.2143 -					/>
  2.2144 -				</FileConfiguration>
  2.2145 -				<FileConfiguration
  2.2146 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.2147 -					>
  2.2148 -					<Tool
  2.2149 -						Name="VCCLCompilerTool"
  2.2150 -						AdditionalIncludeDirectories=""
  2.2151 -						UsePrecompiledHeader="0"
  2.2152 -					/>
  2.2153 -				</FileConfiguration>
  2.2154 -				<FileConfiguration
  2.2155 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2156 -					>
  2.2157 -					<Tool
  2.2158 -						Name="VCCLCompilerTool"
  2.2159 -						AdditionalIncludeDirectories=""
  2.2160 -						UsePrecompiledHeader="0"
  2.2161 -					/>
  2.2162 -				</FileConfiguration>
  2.2163 -				<FileConfiguration
  2.2164 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.2165 -					>
  2.2166 -					<Tool
  2.2167 -						Name="VCCLCompilerTool"
  2.2168 -						AdditionalIncludeDirectories=""
  2.2169 -						UsePrecompiledHeader="0"
  2.2170 -					/>
  2.2171 -				</FileConfiguration>
  2.2172 -				<FileConfiguration
  2.2173 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.2174 -					>
  2.2175 -					<Tool
  2.2176 -						Name="VCCLCompilerTool"
  2.2177 -						AdditionalIncludeDirectories=""
  2.2178 -						UsePrecompiledHeader="0"
  2.2179 -					/>
  2.2180 -				</FileConfiguration>
  2.2181 -				<FileConfiguration
  2.2182 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2183 -					>
  2.2184 -					<Tool
  2.2185 -						Name="VCCLCompilerTool"
  2.2186 -						AdditionalIncludeDirectories=""
  2.2187 -						UsePrecompiledHeader="0"
  2.2188 -					/>
  2.2189 -				</FileConfiguration>
  2.2190  			</File>
  2.2191  			<File
  2.2192  				RelativePath="..\..\src\stdlib\SDL_string.c"
  2.2193 @@ -2545,1000 +996,114 @@
  2.2194  			<File
  2.2195  				RelativePath="..\..\src\video\SDL_surface.c"
  2.2196  				>
  2.2197 -				<FileConfiguration
  2.2198 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.2199 -					>
  2.2200 -					<Tool
  2.2201 -						Name="VCCLCompilerTool"
  2.2202 -						AdditionalIncludeDirectories=""
  2.2203 -						UsePrecompiledHeader="0"
  2.2204 -					/>
  2.2205 -				</FileConfiguration>
  2.2206 -				<FileConfiguration
  2.2207 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.2208 -					>
  2.2209 -					<Tool
  2.2210 -						Name="VCCLCompilerTool"
  2.2211 -						AdditionalIncludeDirectories=""
  2.2212 -						UsePrecompiledHeader="0"
  2.2213 -					/>
  2.2214 -				</FileConfiguration>
  2.2215 -				<FileConfiguration
  2.2216 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2217 -					>
  2.2218 -					<Tool
  2.2219 -						Name="VCCLCompilerTool"
  2.2220 -						AdditionalIncludeDirectories=""
  2.2221 -						UsePrecompiledHeader="0"
  2.2222 -					/>
  2.2223 -				</FileConfiguration>
  2.2224 -				<FileConfiguration
  2.2225 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.2226 -					>
  2.2227 -					<Tool
  2.2228 -						Name="VCCLCompilerTool"
  2.2229 -						AdditionalIncludeDirectories=""
  2.2230 -						UsePrecompiledHeader="0"
  2.2231 -					/>
  2.2232 -				</FileConfiguration>
  2.2233 -				<FileConfiguration
  2.2234 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.2235 -					>
  2.2236 -					<Tool
  2.2237 -						Name="VCCLCompilerTool"
  2.2238 -						AdditionalIncludeDirectories=""
  2.2239 -						UsePrecompiledHeader="0"
  2.2240 -					/>
  2.2241 -				</FileConfiguration>
  2.2242 -				<FileConfiguration
  2.2243 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2244 -					>
  2.2245 -					<Tool
  2.2246 -						Name="VCCLCompilerTool"
  2.2247 -						AdditionalIncludeDirectories=""
  2.2248 -						UsePrecompiledHeader="0"
  2.2249 -					/>
  2.2250 -				</FileConfiguration>
  2.2251  			</File>
  2.2252  			<File
  2.2253 -				RelativePath="..\..\src\thread\generic\SDL_syscond.c"
  2.2254 +				RelativePath="..\..\src\haptic\dummy\SDL_syshaptic.c"
  2.2255  				>
  2.2256 -				<FileConfiguration
  2.2257 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.2258 -					>
  2.2259 -					<Tool
  2.2260 -						Name="VCCLCompilerTool"
  2.2261 -						AdditionalIncludeDirectories=""
  2.2262 -						UsePrecompiledHeader="0"
  2.2263 -					/>
  2.2264 -				</FileConfiguration>
  2.2265 -				<FileConfiguration
  2.2266 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.2267 -					>
  2.2268 -					<Tool
  2.2269 -						Name="VCCLCompilerTool"
  2.2270 -						AdditionalIncludeDirectories=""
  2.2271 -						UsePrecompiledHeader="0"
  2.2272 -					/>
  2.2273 -				</FileConfiguration>
  2.2274 -				<FileConfiguration
  2.2275 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2276 -					>
  2.2277 -					<Tool
  2.2278 -						Name="VCCLCompilerTool"
  2.2279 -						AdditionalIncludeDirectories=""
  2.2280 -						UsePrecompiledHeader="0"
  2.2281 -					/>
  2.2282 -				</FileConfiguration>
  2.2283 -				<FileConfiguration
  2.2284 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.2285 -					>
  2.2286 -					<Tool
  2.2287 -						Name="VCCLCompilerTool"
  2.2288 -						AdditionalIncludeDirectories=""
  2.2289 -						UsePrecompiledHeader="0"
  2.2290 -					/>
  2.2291 -				</FileConfiguration>
  2.2292 -				<FileConfiguration
  2.2293 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.2294 -					>
  2.2295 -					<Tool
  2.2296 -						Name="VCCLCompilerTool"
  2.2297 -						AdditionalIncludeDirectories=""
  2.2298 -						UsePrecompiledHeader="0"
  2.2299 -					/>
  2.2300 -				</FileConfiguration>
  2.2301 -				<FileConfiguration
  2.2302 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2303 -					>
  2.2304 -					<Tool
  2.2305 -						Name="VCCLCompilerTool"
  2.2306 -						AdditionalIncludeDirectories=""
  2.2307 -						UsePrecompiledHeader="0"
  2.2308 -					/>
  2.2309 -				</FileConfiguration>
  2.2310 -			</File>
  2.2311 -			<File
  2.2312 -				RelativePath="..\..\src\video\wincommon\SDL_sysevents.c"
  2.2313 -				>
  2.2314 -				<FileConfiguration
  2.2315 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.2316 -					>
  2.2317 -					<Tool
  2.2318 -						Name="VCCLCompilerTool"
  2.2319 -						AdditionalIncludeDirectories=""
  2.2320 -						UsePrecompiledHeader="0"
  2.2321 -					/>
  2.2322 -				</FileConfiguration>
  2.2323 -				<FileConfiguration
  2.2324 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.2325 -					>
  2.2326 -					<Tool
  2.2327 -						Name="VCCLCompilerTool"
  2.2328 -						AdditionalIncludeDirectories=""
  2.2329 -						UsePrecompiledHeader="0"
  2.2330 -					/>
  2.2331 -				</FileConfiguration>
  2.2332 -				<FileConfiguration
  2.2333 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2334 -					>
  2.2335 -					<Tool
  2.2336 -						Name="VCCLCompilerTool"
  2.2337 -						AdditionalIncludeDirectories=""
  2.2338 -						UsePrecompiledHeader="0"
  2.2339 -					/>
  2.2340 -				</FileConfiguration>
  2.2341 -				<FileConfiguration
  2.2342 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.2343 -					>
  2.2344 -					<Tool
  2.2345 -						Name="VCCLCompilerTool"
  2.2346 -						AdditionalIncludeDirectories=""
  2.2347 -						UsePrecompiledHeader="0"
  2.2348 -					/>
  2.2349 -				</FileConfiguration>
  2.2350 -				<FileConfiguration
  2.2351 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.2352 -					>
  2.2353 -					<Tool
  2.2354 -						Name="VCCLCompilerTool"
  2.2355 -						AdditionalIncludeDirectories=""
  2.2356 -						UsePrecompiledHeader="0"
  2.2357 -					/>
  2.2358 -				</FileConfiguration>
  2.2359 -				<FileConfiguration
  2.2360 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2361 -					>
  2.2362 -					<Tool
  2.2363 -						Name="VCCLCompilerTool"
  2.2364 -						AdditionalIncludeDirectories=""
  2.2365 -						UsePrecompiledHeader="0"
  2.2366 -					/>
  2.2367 -				</FileConfiguration>
  2.2368  			</File>
  2.2369  			<File
  2.2370  				RelativePath="..\..\src\joystick\dummy\SDL_sysjoystick.c"
  2.2371  				>
  2.2372 -				<FileConfiguration
  2.2373 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.2374 -					>
  2.2375 -					<Tool
  2.2376 -						Name="VCCLCompilerTool"
  2.2377 -						AdditionalIncludeDirectories=""
  2.2378 -						UsePrecompiledHeader="0"
  2.2379 -					/>
  2.2380 -				</FileConfiguration>
  2.2381 -				<FileConfiguration
  2.2382 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.2383 -					>
  2.2384 -					<Tool
  2.2385 -						Name="VCCLCompilerTool"
  2.2386 -						AdditionalIncludeDirectories=""
  2.2387 -						UsePrecompiledHeader="0"
  2.2388 -					/>
  2.2389 -				</FileConfiguration>
  2.2390 -				<FileConfiguration
  2.2391 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2392 -					>
  2.2393 -					<Tool
  2.2394 -						Name="VCCLCompilerTool"
  2.2395 -						AdditionalIncludeDirectories=""
  2.2396 -						UsePrecompiledHeader="0"
  2.2397 -					/>
  2.2398 -				</FileConfiguration>
  2.2399 -				<FileConfiguration
  2.2400 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.2401 -					>
  2.2402 -					<Tool
  2.2403 -						Name="VCCLCompilerTool"
  2.2404 -						AdditionalIncludeDirectories=""
  2.2405 -						UsePrecompiledHeader="0"
  2.2406 -					/>
  2.2407 -				</FileConfiguration>
  2.2408 -				<FileConfiguration
  2.2409 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.2410 -					>
  2.2411 -					<Tool
  2.2412 -						Name="VCCLCompilerTool"
  2.2413 -						AdditionalIncludeDirectories=""
  2.2414 -						UsePrecompiledHeader="0"
  2.2415 -					/>
  2.2416 -				</FileConfiguration>
  2.2417 -				<FileConfiguration
  2.2418 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2419 -					>
  2.2420 -					<Tool
  2.2421 -						Name="VCCLCompilerTool"
  2.2422 -						AdditionalIncludeDirectories=""
  2.2423 -						UsePrecompiledHeader="0"
  2.2424 -					/>
  2.2425 -				</FileConfiguration>
  2.2426  			</File>
  2.2427  			<File
  2.2428 -				RelativePath="..\..\src\loadso\win32\SDL_sysloadso.c"
  2.2429 +				RelativePath="..\..\src\loadso\windows\SDL_sysloadso.c"
  2.2430  				>
  2.2431  			</File>
  2.2432  			<File
  2.2433 -				RelativePath="..\..\src\video\wincommon\SDL_sysmouse.c"
  2.2434 +				RelativePath="..\..\src\thread\windows\SDL_sysmutex.c"
  2.2435  				>
  2.2436 -				<FileConfiguration
  2.2437 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.2438 -					>
  2.2439 -					<Tool
  2.2440 -						Name="VCCLCompilerTool"
  2.2441 -						AdditionalIncludeDirectories=""
  2.2442 -						UsePrecompiledHeader="0"
  2.2443 -					/>
  2.2444 -				</FileConfiguration>
  2.2445 -				<FileConfiguration
  2.2446 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.2447 -					>
  2.2448 -					<Tool
  2.2449 -						Name="VCCLCompilerTool"
  2.2450 -						AdditionalIncludeDirectories=""
  2.2451 -						UsePrecompiledHeader="0"
  2.2452 -					/>
  2.2453 -				</FileConfiguration>
  2.2454 -				<FileConfiguration
  2.2455 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2456 -					>
  2.2457 -					<Tool
  2.2458 -						Name="VCCLCompilerTool"
  2.2459 -						AdditionalIncludeDirectories=""
  2.2460 -						UsePrecompiledHeader="0"
  2.2461 -					/>
  2.2462 -				</FileConfiguration>
  2.2463 -				<FileConfiguration
  2.2464 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.2465 -					>
  2.2466 -					<Tool
  2.2467 -						Name="VCCLCompilerTool"
  2.2468 -						AdditionalIncludeDirectories=""
  2.2469 -						UsePrecompiledHeader="0"
  2.2470 -					/>
  2.2471 -				</FileConfiguration>
  2.2472 -				<FileConfiguration
  2.2473 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.2474 -					>
  2.2475 -					<Tool
  2.2476 -						Name="VCCLCompilerTool"
  2.2477 -						AdditionalIncludeDirectories=""
  2.2478 -						UsePrecompiledHeader="0"
  2.2479 -					/>
  2.2480 -				</FileConfiguration>
  2.2481 -				<FileConfiguration
  2.2482 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2483 -					>
  2.2484 -					<Tool
  2.2485 -						Name="VCCLCompilerTool"
  2.2486 -						AdditionalIncludeDirectories=""
  2.2487 -						UsePrecompiledHeader="0"
  2.2488 -					/>
  2.2489 -				</FileConfiguration>
  2.2490  			</File>
  2.2491  			<File
  2.2492 -				RelativePath="..\..\src\thread\win32\SDL_sysmutex.c"
  2.2493 +				RelativePath="..\..\src\power\windows\SDL_syspower.c"
  2.2494  				>
  2.2495 -				<FileConfiguration
  2.2496 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.2497 -					>
  2.2498 -					<Tool
  2.2499 -						Name="VCCLCompilerTool"
  2.2500 -						AdditionalIncludeDirectories=""
  2.2501 -						UsePrecompiledHeader="0"
  2.2502 -					/>
  2.2503 -				</FileConfiguration>
  2.2504 -				<FileConfiguration
  2.2505 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.2506 -					>
  2.2507 -					<Tool
  2.2508 -						Name="VCCLCompilerTool"
  2.2509 -						AdditionalIncludeDirectories=""
  2.2510 -						UsePrecompiledHeader="0"
  2.2511 -					/>
  2.2512 -				</FileConfiguration>
  2.2513 -				<FileConfiguration
  2.2514 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2515 -					>
  2.2516 -					<Tool
  2.2517 -						Name="VCCLCompilerTool"
  2.2518 -						AdditionalIncludeDirectories=""
  2.2519 -						UsePrecompiledHeader="0"
  2.2520 -					/>
  2.2521 -				</FileConfiguration>
  2.2522 -				<FileConfiguration
  2.2523 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.2524 -					>
  2.2525 -					<Tool
  2.2526 -						Name="VCCLCompilerTool"
  2.2527 -						AdditionalIncludeDirectories=""
  2.2528 -						UsePrecompiledHeader="0"
  2.2529 -					/>
  2.2530 -				</FileConfiguration>
  2.2531 -				<FileConfiguration
  2.2532 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.2533 -					>
  2.2534 -					<Tool
  2.2535 -						Name="VCCLCompilerTool"
  2.2536 -						AdditionalIncludeDirectories=""
  2.2537 -						UsePrecompiledHeader="0"
  2.2538 -					/>
  2.2539 -				</FileConfiguration>
  2.2540 -				<FileConfiguration
  2.2541 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2542 -					>
  2.2543 -					<Tool
  2.2544 -						Name="VCCLCompilerTool"
  2.2545 -						AdditionalIncludeDirectories=""
  2.2546 -						UsePrecompiledHeader="0"
  2.2547 -					/>
  2.2548 -				</FileConfiguration>
  2.2549  			</File>
  2.2550  			<File
  2.2551 -				RelativePath="..\..\src\thread\win32\SDL_syssem.c"
  2.2552 +				RelativePath="..\..\src\thread\windows\SDL_syssem.c"
  2.2553  				>
  2.2554 -				<FileConfiguration
  2.2555 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.2556 -					>
  2.2557 -					<Tool
  2.2558 -						Name="VCCLCompilerTool"
  2.2559 -						AdditionalIncludeDirectories=""
  2.2560 -						UsePrecompiledHeader="0"
  2.2561 -					/>
  2.2562 -				</FileConfiguration>
  2.2563 -				<FileConfiguration
  2.2564 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.2565 -					>
  2.2566 -					<Tool
  2.2567 -						Name="VCCLCompilerTool"
  2.2568 -						AdditionalIncludeDirectories=""
  2.2569 -						UsePrecompiledHeader="0"
  2.2570 -					/>
  2.2571 -				</FileConfiguration>
  2.2572 -				<FileConfiguration
  2.2573 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2574 -					>
  2.2575 -					<Tool
  2.2576 -						Name="VCCLCompilerTool"
  2.2577 -						AdditionalIncludeDirectories=""
  2.2578 -						UsePrecompiledHeader="0"
  2.2579 -					/>
  2.2580 -				</FileConfiguration>
  2.2581 -				<FileConfiguration
  2.2582 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.2583 -					>
  2.2584 -					<Tool
  2.2585 -						Name="VCCLCompilerTool"
  2.2586 -						AdditionalIncludeDirectories=""
  2.2587 -						UsePrecompiledHeader="0"
  2.2588 -					/>
  2.2589 -				</FileConfiguration>
  2.2590 -				<FileConfiguration
  2.2591 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.2592 -					>
  2.2593 -					<Tool
  2.2594 -						Name="VCCLCompilerTool"
  2.2595 -						AdditionalIncludeDirectories=""
  2.2596 -						UsePrecompiledHeader="0"
  2.2597 -					/>
  2.2598 -				</FileConfiguration>
  2.2599 -				<FileConfiguration
  2.2600 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2601 -					>
  2.2602 -					<Tool
  2.2603 -						Name="VCCLCompilerTool"
  2.2604 -						AdditionalIncludeDirectories=""
  2.2605 -						UsePrecompiledHeader="0"
  2.2606 -					/>
  2.2607 -				</FileConfiguration>
  2.2608  			</File>
  2.2609  			<File
  2.2610 -				RelativePath="..\..\src\thread\win32\SDL_systhread.c"
  2.2611 +				RelativePath="..\..\src\thread\windows\SDL_systhread.c"
  2.2612  				>
  2.2613 -				<FileConfiguration
  2.2614 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.2615 -					>
  2.2616 -					<Tool
  2.2617 -						Name="VCCLCompilerTool"
  2.2618 -						AdditionalIncludeDirectories=""
  2.2619 -						UsePrecompiledHeader="0"
  2.2620 -					/>
  2.2621 -				</FileConfiguration>
  2.2622 -				<FileConfiguration
  2.2623 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.2624 -					>
  2.2625 -					<Tool
  2.2626 -						Name="VCCLCompilerTool"
  2.2627 -						AdditionalIncludeDirectories=""
  2.2628 -						UsePrecompiledHeader="0"
  2.2629 -					/>
  2.2630 -				</FileConfiguration>
  2.2631 -				<FileConfiguration
  2.2632 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2633 -					>
  2.2634 -					<Tool
  2.2635 -						Name="VCCLCompilerTool"
  2.2636 -						AdditionalIncludeDirectories=""
  2.2637 -						UsePrecompiledHeader="0"
  2.2638 -					/>
  2.2639 -				</FileConfiguration>
  2.2640 -				<FileConfiguration
  2.2641 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.2642 -					>
  2.2643 -					<Tool
  2.2644 -						Name="VCCLCompilerTool"
  2.2645 -						AdditionalIncludeDirectories=""
  2.2646 -						UsePrecompiledHeader="0"
  2.2647 -					/>
  2.2648 -				</FileConfiguration>
  2.2649 -				<FileConfiguration
  2.2650 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.2651 -					>
  2.2652 -					<Tool
  2.2653 -						Name="VCCLCompilerTool"
  2.2654 -						AdditionalIncludeDirectories=""
  2.2655 -						UsePrecompiledHeader="0"
  2.2656 -					/>
  2.2657 -				</FileConfiguration>
  2.2658 -				<FileConfiguration
  2.2659 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2660 -					>
  2.2661 -					<Tool
  2.2662 -						Name="VCCLCompilerTool"
  2.2663 -						AdditionalIncludeDirectories=""
  2.2664 -						UsePrecompiledHeader="0"
  2.2665 -					/>
  2.2666 -				</FileConfiguration>
  2.2667  			</File>
  2.2668  			<File
  2.2669  				RelativePath="..\..\src\timer\wince\SDL_systimer.c"
  2.2670  				>
  2.2671  			</File>
  2.2672  			<File
  2.2673 -				RelativePath="..\..\src\video\wincommon\SDL_syswm.c"
  2.2674 -				>
  2.2675 -				<FileConfiguration
  2.2676 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.2677 -					>
  2.2678 -					<Tool
  2.2679 -						Name="VCCLCompilerTool"
  2.2680 -						AdditionalIncludeDirectories=""
  2.2681 -						UsePrecompiledHeader="0"
  2.2682 -					/>
  2.2683 -				</FileConfiguration>
  2.2684 -				<FileConfiguration
  2.2685 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.2686 -					>
  2.2687 -					<Tool
  2.2688 -						Name="VCCLCompilerTool"
  2.2689 -						AdditionalIncludeDirectories=""
  2.2690 -						UsePrecompiledHeader="0"
  2.2691 -					/>
  2.2692 -				</FileConfiguration>
  2.2693 -				<FileConfiguration
  2.2694 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2695 -					>
  2.2696 -					<Tool
  2.2697 -						Name="VCCLCompilerTool"
  2.2698 -						AdditionalIncludeDirectories=""
  2.2699 -						UsePrecompiledHeader="0"
  2.2700 -					/>
  2.2701 -				</FileConfiguration>
  2.2702 -				<FileConfiguration
  2.2703 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.2704 -					>
  2.2705 -					<Tool
  2.2706 -						Name="VCCLCompilerTool"
  2.2707 -						AdditionalIncludeDirectories=""
  2.2708 -						UsePrecompiledHeader="0"
  2.2709 -					/>
  2.2710 -				</FileConfiguration>
  2.2711 -				<FileConfiguration
  2.2712 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.2713 -					>
  2.2714 -					<Tool
  2.2715 -						Name="VCCLCompilerTool"
  2.2716 -						AdditionalIncludeDirectories=""
  2.2717 -						UsePrecompiledHeader="0"
  2.2718 -					/>
  2.2719 -				</FileConfiguration>
  2.2720 -				<FileConfiguration
  2.2721 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2722 -					>
  2.2723 -					<Tool
  2.2724 -						Name="VCCLCompilerTool"
  2.2725 -						AdditionalIncludeDirectories=""
  2.2726 -						UsePrecompiledHeader="0"
  2.2727 -					/>
  2.2728 -				</FileConfiguration>
  2.2729 -			</File>
  2.2730 -			<File
  2.2731  				RelativePath="..\..\src\thread\SDL_thread.c"
  2.2732  				>
  2.2733 -				<FileConfiguration
  2.2734 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.2735 -					>
  2.2736 -					<Tool
  2.2737 -						Name="VCCLCompilerTool"
  2.2738 -						AdditionalIncludeDirectories=""
  2.2739 -						UsePrecompiledHeader="0"
  2.2740 -					/>
  2.2741 -				</FileConfiguration>
  2.2742 -				<FileConfiguration
  2.2743 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.2744 -					>
  2.2745 -					<Tool
  2.2746 -						Name="VCCLCompilerTool"
  2.2747 -						AdditionalIncludeDirectories=""
  2.2748 -						UsePrecompiledHeader="0"
  2.2749 -					/>
  2.2750 -				</FileConfiguration>
  2.2751 -				<FileConfiguration
  2.2752 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2753 -					>
  2.2754 -					<Tool
  2.2755 -						Name="VCCLCompilerTool"
  2.2756 -						AdditionalIncludeDirectories=""
  2.2757 -						UsePrecompiledHeader="0"
  2.2758 -					/>
  2.2759 -				</FileConfiguration>
  2.2760 -				<FileConfiguration
  2.2761 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.2762 -					>
  2.2763 -					<Tool
  2.2764 -						Name="VCCLCompilerTool"
  2.2765 -						AdditionalIncludeDirectories=""
  2.2766 -						UsePrecompiledHeader="0"
  2.2767 -					/>
  2.2768 -				</FileConfiguration>
  2.2769 -				<FileConfiguration
  2.2770 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.2771 -					>
  2.2772 -					<Tool
  2.2773 -						Name="VCCLCompilerTool"
  2.2774 -						AdditionalIncludeDirectories=""
  2.2775 -						UsePrecompiledHeader="0"
  2.2776 -					/>
  2.2777 -				</FileConfiguration>
  2.2778 -				<FileConfiguration
  2.2779 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2780 -					>
  2.2781 -					<Tool
  2.2782 -						Name="VCCLCompilerTool"
  2.2783 -						AdditionalIncludeDirectories=""
  2.2784 -						UsePrecompiledHeader="0"
  2.2785 -					/>
  2.2786 -				</FileConfiguration>
  2.2787  			</File>
  2.2788  			<File
  2.2789  				RelativePath="..\..\src\timer\SDL_timer.c"
  2.2790  				>
  2.2791 -				<FileConfiguration
  2.2792 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.2793 -					>
  2.2794 -					<Tool
  2.2795 -						Name="VCCLCompilerTool"
  2.2796 -						AdditionalIncludeDirectories=""
  2.2797 -						UsePrecompiledHeader="0"
  2.2798 -					/>
  2.2799 -				</FileConfiguration>
  2.2800 -				<FileConfiguration
  2.2801 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.2802 -					>
  2.2803 -					<Tool
  2.2804 -						Name="VCCLCompilerTool"
  2.2805 -						AdditionalIncludeDirectories=""
  2.2806 -						UsePrecompiledHeader="0"
  2.2807 -					/>
  2.2808 -				</FileConfiguration>
  2.2809 -				<FileConfiguration
  2.2810 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2811 -					>
  2.2812 -					<Tool
  2.2813 -						Name="VCCLCompilerTool"
  2.2814 -						AdditionalIncludeDirectories=""
  2.2815 -						UsePrecompiledHeader="0"
  2.2816 -					/>
  2.2817 -				</FileConfiguration>
  2.2818 -				<FileConfiguration
  2.2819 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.2820 -					>
  2.2821 -					<Tool
  2.2822 -						Name="VCCLCompilerTool"
  2.2823 -						AdditionalIncludeDirectories=""
  2.2824 -						UsePrecompiledHeader="0"
  2.2825 -					/>
  2.2826 -				</FileConfiguration>
  2.2827 -				<FileConfiguration
  2.2828 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.2829 -					>
  2.2830 -					<Tool
  2.2831 -						Name="VCCLCompilerTool"
  2.2832 -						AdditionalIncludeDirectories=""
  2.2833 -						UsePrecompiledHeader="0"
  2.2834 -					/>
  2.2835 -				</FileConfiguration>
  2.2836 -				<FileConfiguration
  2.2837 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2838 -					>
  2.2839 -					<Tool
  2.2840 -						Name="VCCLCompilerTool"
  2.2841 -						AdditionalIncludeDirectories=""
  2.2842 -						UsePrecompiledHeader="0"
  2.2843 -					/>
  2.2844 -				</FileConfiguration>
  2.2845 +			</File>
  2.2846 +			<File
  2.2847 +				RelativePath="..\..\src\events\SDL_touch.c"
  2.2848 +				>
  2.2849  			</File>
  2.2850  			<File
  2.2851  				RelativePath="..\..\src\video\SDL_video.c"
  2.2852  				>
  2.2853 -				<FileConfiguration
  2.2854 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.2855 -					>
  2.2856 -					<Tool
  2.2857 -						Name="VCCLCompilerTool"
  2.2858 -						AdditionalIncludeDirectories=""
  2.2859 -						UsePrecompiledHeader="0"
  2.2860 -					/>
  2.2861 -				</FileConfiguration>
  2.2862 -				<FileConfiguration
  2.2863 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.2864 -					>
  2.2865 -					<Tool
  2.2866 -						Name="VCCLCompilerTool"
  2.2867 -						AdditionalIncludeDirectories=""
  2.2868 -						UsePrecompiledHeader="0"
  2.2869 -					/>
  2.2870 -				</FileConfiguration>
  2.2871 -				<FileConfiguration
  2.2872 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2873 -					>
  2.2874 -					<Tool
  2.2875 -						Name="VCCLCompilerTool"
  2.2876 -						AdditionalIncludeDirectories=""
  2.2877 -						UsePrecompiledHeader="0"
  2.2878 -					/>
  2.2879 -				</FileConfiguration>
  2.2880 -				<FileConfiguration
  2.2881 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.2882 -					>
  2.2883 -					<Tool
  2.2884 -						Name="VCCLCompilerTool"
  2.2885 -						AdditionalIncludeDirectories=""
  2.2886 -						UsePrecompiledHeader="0"
  2.2887 -					/>
  2.2888 -				</FileConfiguration>
  2.2889 -				<FileConfiguration
  2.2890 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.2891 -					>
  2.2892 -					<Tool
  2.2893 -						Name="VCCLCompilerTool"
  2.2894 -						AdditionalIncludeDirectories=""
  2.2895 -						UsePrecompiledHeader="0"
  2.2896 -					/>
  2.2897 -				</FileConfiguration>
  2.2898 -				<FileConfiguration
  2.2899 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2900 -					>
  2.2901 -					<Tool
  2.2902 -						Name="VCCLCompilerTool"
  2.2903 -						AdditionalIncludeDirectories=""
  2.2904 -						UsePrecompiledHeader="0"
  2.2905 -					/>
  2.2906 -				</FileConfiguration>
  2.2907  			</File>
  2.2908  			<File
  2.2909  				RelativePath="..\..\src\audio\SDL_wave.c"
  2.2910  				>
  2.2911 -				<FileConfiguration
  2.2912 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.2913 -					>
  2.2914 -					<Tool
  2.2915 -						Name="VCCLCompilerTool"
  2.2916 -						AdditionalIncludeDirectories=""
  2.2917 -						UsePrecompiledHeader="0"
  2.2918 -					/>
  2.2919 -				</FileConfiguration>
  2.2920 -				<FileConfiguration
  2.2921 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.2922 -					>
  2.2923 -					<Tool
  2.2924 -						Name="VCCLCompilerTool"
  2.2925 -						AdditionalIncludeDirectories=""
  2.2926 -						UsePrecompiledHeader="0"
  2.2927 -					/>
  2.2928 -				</FileConfiguration>
  2.2929 -				<FileConfiguration
  2.2930 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2931 -					>
  2.2932 -					<Tool
  2.2933 -						Name="VCCLCompilerTool"
  2.2934 -						AdditionalIncludeDirectories=""
  2.2935 -						UsePrecompiledHeader="0"
  2.2936 -					/>
  2.2937 -				</FileConfiguration>
  2.2938 -				<FileConfiguration
  2.2939 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.2940 -					>
  2.2941 -					<Tool
  2.2942 -						Name="VCCLCompilerTool"
  2.2943 -						AdditionalIncludeDirectories=""
  2.2944 -						UsePrecompiledHeader="0"
  2.2945 -					/>
  2.2946 -				</FileConfiguration>
  2.2947 -				<FileConfiguration
  2.2948 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.2949 -					>
  2.2950 -					<Tool
  2.2951 -						Name="VCCLCompilerTool"
  2.2952 -						AdditionalIncludeDirectories=""
  2.2953 -						UsePrecompiledHeader="0"
  2.2954 -					/>
  2.2955 -				</FileConfiguration>
  2.2956 -				<FileConfiguration
  2.2957 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2958 -					>
  2.2959 -					<Tool
  2.2960 -						Name="VCCLCompilerTool"
  2.2961 -						AdditionalIncludeDirectories=""
  2.2962 -						UsePrecompiledHeader="0"
  2.2963 -					/>
  2.2964 -				</FileConfiguration>
  2.2965  			</File>
  2.2966  			<File
  2.2967 -				RelativePath="..\..\src\video\wincommon\SDL_wingl.c"
  2.2968 +				RelativePath="..\..\src\events\SDL_windowevents.c"
  2.2969  				>
  2.2970 -				<FileConfiguration
  2.2971 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.2972 -					>
  2.2973 -					<Tool
  2.2974 -						Name="VCCLCompilerTool"
  2.2975 -						AdditionalIncludeDirectories=""
  2.2976 -						UsePrecompiledHeader="0"
  2.2977 -					/>
  2.2978 -				</FileConfiguration>
  2.2979 -				<FileConfiguration
  2.2980 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.2981 -					>
  2.2982 -					<Tool
  2.2983 -						Name="VCCLCompilerTool"
  2.2984 -						AdditionalIncludeDirectories=""
  2.2985 -						UsePrecompiledHeader="0"
  2.2986 -					/>
  2.2987 -				</FileConfiguration>
  2.2988 -				<FileConfiguration
  2.2989 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.2990 -					>
  2.2991 -					<Tool
  2.2992 -						Name="VCCLCompilerTool"
  2.2993 -						AdditionalIncludeDirectories=""
  2.2994 -						UsePrecompiledHeader="0"
  2.2995 -					/>
  2.2996 -				</FileConfiguration>
  2.2997 -				<FileConfiguration
  2.2998 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.2999 -					>
  2.3000 -					<Tool
  2.3001 -						Name="VCCLCompilerTool"
  2.3002 -						AdditionalIncludeDirectories=""
  2.3003 -						UsePrecompiledHeader="0"
  2.3004 -					/>
  2.3005 -				</FileConfiguration>
  2.3006 -				<FileConfiguration
  2.3007 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.3008 -					>
  2.3009 -					<Tool
  2.3010 -						Name="VCCLCompilerTool"
  2.3011 -						AdditionalIncludeDirectories=""
  2.3012 -						UsePrecompiledHeader="0"
  2.3013 -					/>
  2.3014 -				</FileConfiguration>
  2.3015 -				<FileConfiguration
  2.3016 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.3017 -					>
  2.3018 -					<Tool
  2.3019 -						Name="VCCLCompilerTool"
  2.3020 -						AdditionalIncludeDirectories=""
  2.3021 -						UsePrecompiledHeader="0"
  2.3022 -					/>
  2.3023 -				</FileConfiguration>
  2.3024  			</File>
  2.3025  			<File
  2.3026 -				RelativePath="..\..\src\video\SDL_yuv.c"
  2.3027 +				RelativePath="..\..\src\video\windows\SDL_windowsclipboard.c"
  2.3028  				>
  2.3029 -				<FileConfiguration
  2.3030 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.3031 -					>
  2.3032 -					<Tool
  2.3033 -						Name="VCCLCompilerTool"
  2.3034 -						AdditionalIncludeDirectories=""
  2.3035 -						UsePrecompiledHeader="0"
  2.3036 -					/>
  2.3037 -				</FileConfiguration>
  2.3038 -				<FileConfiguration
  2.3039 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.3040 -					>
  2.3041 -					<Tool
  2.3042 -						Name="VCCLCompilerTool"
  2.3043 -						AdditionalIncludeDirectories=""
  2.3044 -						UsePrecompiledHeader="0"
  2.3045 -					/>
  2.3046 -				</FileConfiguration>
  2.3047 -				<FileConfiguration
  2.3048 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.3049 -					>
  2.3050 -					<Tool
  2.3051 -						Name="VCCLCompilerTool"
  2.3052 -						AdditionalIncludeDirectories=""
  2.3053 -						UsePrecompiledHeader="0"
  2.3054 -					/>
  2.3055 -				</FileConfiguration>
  2.3056 -				<FileConfiguration
  2.3057 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.3058 -					>
  2.3059 -					<Tool
  2.3060 -						Name="VCCLCompilerTool"
  2.3061 -						AdditionalIncludeDirectories=""
  2.3062 -						UsePrecompiledHeader="0"
  2.3063 -					/>
  2.3064 -				</FileConfiguration>
  2.3065 -				<FileConfiguration
  2.3066 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.3067 -					>
  2.3068 -					<Tool
  2.3069 -						Name="VCCLCompilerTool"
  2.3070 -						AdditionalIncludeDirectories=""
  2.3071 -						UsePrecompiledHeader="0"
  2.3072 -					/>
  2.3073 -				</FileConfiguration>
  2.3074 -				<FileConfiguration
  2.3075 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.3076 -					>
  2.3077 -					<Tool
  2.3078 -						Name="VCCLCompilerTool"
  2.3079 -						AdditionalIncludeDirectories=""
  2.3080 -						UsePrecompiledHeader="0"
  2.3081 -					/>
  2.3082 -				</FileConfiguration>
  2.3083 +			</File>
  2.3084 +			<File
  2.3085 +				RelativePath="..\..\src\video\windows\SDL_windowsevents.c"
  2.3086 +				>
  2.3087 +			</File>
  2.3088 +			<File
  2.3089 +				RelativePath="..\..\src\video\windows\SDL_windowsgamma.c"
  2.3090 +				>
  2.3091 +			</File>
  2.3092 +			<File
  2.3093 +				RelativePath="..\..\src\video\windows\SDL_windowskeyboard.c"
  2.3094 +				>
  2.3095 +			</File>
  2.3096 +			<File
  2.3097 +				RelativePath="..\..\src\video\windows\SDL_windowsmodes.c"
  2.3098 +				>
  2.3099 +			</File>
  2.3100 +			<File
  2.3101 +				RelativePath="..\..\src\video\windows\SDL_windowsmouse.c"
  2.3102 +				>
  2.3103 +			</File>
  2.3104 +			<File
  2.3105 +				RelativePath="..\..\src\video\windows\SDL_windowsopengl.c"
  2.3106 +				>
  2.3107 +			</File>
  2.3108 +			<File
  2.3109 +				RelativePath="..\..\src\video\windows\SDL_windowsshape.c"
  2.3110 +				>
  2.3111 +			</File>
  2.3112 +			<File
  2.3113 +				RelativePath="..\..\src\video\windows\SDL_windowsvideo.c"
  2.3114 +				>
  2.3115 +			</File>
  2.3116 +			<File
  2.3117 +				RelativePath="..\..\src\video\windows\SDL_windowswindow.c"
  2.3118 +				>
  2.3119  			</File>
  2.3120  			<File
  2.3121  				RelativePath="..\..\src\video\SDL_yuv_mmx.c"
  2.3122  				>
  2.3123 -				<FileConfiguration
  2.3124 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.3125 -					>
  2.3126 -					<Tool
  2.3127 -						Name="VCCLCompilerTool"
  2.3128 -						AdditionalIncludeDirectories=""
  2.3129 -						UsePrecompiledHeader="0"
  2.3130 -					/>
  2.3131 -				</FileConfiguration>
  2.3132 -				<FileConfiguration
  2.3133 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.3134 -					>
  2.3135 -					<Tool
  2.3136 -						Name="VCCLCompilerTool"
  2.3137 -						AdditionalIncludeDirectories=""
  2.3138 -						UsePrecompiledHeader="0"
  2.3139 -					/>
  2.3140 -				</FileConfiguration>
  2.3141 -				<FileConfiguration
  2.3142 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.3143 -					>
  2.3144 -					<Tool
  2.3145 -						Name="VCCLCompilerTool"
  2.3146 -						AdditionalIncludeDirectories=""
  2.3147 -						UsePrecompiledHeader="0"
  2.3148 -					/>
  2.3149 -				</FileConfiguration>
  2.3150 -				<FileConfiguration
  2.3151 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.3152 -					>
  2.3153 -					<Tool
  2.3154 -						Name="VCCLCompilerTool"
  2.3155 -						AdditionalIncludeDirectories=""
  2.3156 -						UsePrecompiledHeader="0"
  2.3157 -					/>
  2.3158 -				</FileConfiguration>
  2.3159 -				<FileConfiguration
  2.3160 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.3161 -					>
  2.3162 -					<Tool
  2.3163 -						Name="VCCLCompilerTool"
  2.3164 -						AdditionalIncludeDirectories=""
  2.3165 -						UsePrecompiledHeader="0"
  2.3166 -					/>
  2.3167 -				</FileConfiguration>
  2.3168 -				<FileConfiguration
  2.3169 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.3170 -					>
  2.3171 -					<Tool
  2.3172 -						Name="VCCLCompilerTool"
  2.3173 -						AdditionalIncludeDirectories=""
  2.3174 -						UsePrecompiledHeader="0"
  2.3175 -					/>
  2.3176 -				</FileConfiguration>
  2.3177  			</File>
  2.3178  			<File
  2.3179  				RelativePath="..\..\src\video\SDL_yuv_sw.c"
  2.3180  				>
  2.3181  			</File>
  2.3182  			<File
  2.3183 -				RelativePath="..\..\src\thread\win32\win_ce_semaphore.c"
  2.3184 +				RelativePath="..\..\src\thread\windows\win_ce_semaphore.c"
  2.3185  				>
  2.3186 -				<FileConfiguration
  2.3187 -					Name="Debug|Smartphone 2003 (ARMV4)"
  2.3188 -					>
  2.3189 -					<Tool
  2.3190 -						Name="VCCLCompilerTool"
  2.3191 -						AdditionalIncludeDirectories=""
  2.3192 -						UsePrecompiledHeader="0"
  2.3193 -					/>
  2.3194 -				</FileConfiguration>
  2.3195 -				<FileConfiguration
  2.3196 -					Name="Debug|Pocket PC 2003 (ARMV4)"
  2.3197 -					>
  2.3198 -					<Tool
  2.3199 -						Name="VCCLCompilerTool"
  2.3200 -						AdditionalIncludeDirectories=""
  2.3201 -						UsePrecompiledHeader="0"
  2.3202 -					/>
  2.3203 -				</FileConfiguration>
  2.3204 -				<FileConfiguration
  2.3205 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.3206 -					>
  2.3207 -					<Tool
  2.3208 -						Name="VCCLCompilerTool"
  2.3209 -						AdditionalIncludeDirectories=""
  2.3210 -						UsePrecompiledHeader="0"
  2.3211 -					/>
  2.3212 -				</FileConfiguration>
  2.3213 -				<FileConfiguration
  2.3214 -					Name="Release|Smartphone 2003 (ARMV4)"
  2.3215 -					>
  2.3216 -					<Tool
  2.3217 -						Name="VCCLCompilerTool"
  2.3218 -						AdditionalIncludeDirectories=""
  2.3219 -						UsePrecompiledHeader="0"
  2.3220 -					/>
  2.3221 -				</FileConfiguration>
  2.3222 -				<FileConfiguration
  2.3223 -					Name="Release|Pocket PC 2003 (ARMV4)"
  2.3224 -					>
  2.3225 -					<Tool
  2.3226 -						Name="VCCLCompilerTool"
  2.3227 -						AdditionalIncludeDirectories=""
  2.3228 -						UsePrecompiledHeader="0"
  2.3229 -					/>
  2.3230 -				</FileConfiguration>
  2.3231 -				<FileConfiguration
  2.3232 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
  2.3233 -					>
  2.3234 -					<Tool
  2.3235 -						Name="VCCLCompilerTool"
  2.3236 -						AdditionalIncludeDirectories=""
  2.3237 -						UsePrecompiledHeader="0"
  2.3238 -					/>
  2.3239 -				</FileConfiguration>
  2.3240  			</File>
  2.3241  		</Filter>
  2.3242  		<Filter
  2.3243 @@ -3546,27 +1111,19 @@
  2.3244  			Filter="h;hpp;hxx;hm;inl"
  2.3245  			>
  2.3246  			<File
  2.3247 -				RelativePath="..\..\include\begin_code.h"
  2.3248 +				RelativePath="..\..\src\events\blank_cursor.h"
  2.3249  				>
  2.3250  			</File>
  2.3251  			<File
  2.3252 -				RelativePath="..\..\src\video\blank_cursor.h"
  2.3253 +				RelativePath="..\..\src\events\default_cursor.h"
  2.3254  				>
  2.3255  			</File>
  2.3256  			<File
  2.3257 -				RelativePath="..\..\include\close_code.h"
  2.3258 +				RelativePath="..\..\src\libm\math.h"
  2.3259  				>
  2.3260  			</File>
  2.3261  			<File
  2.3262 -				RelativePath="..\..\src\video\default_cursor.h"
  2.3263 -				>
  2.3264 -			</File>
  2.3265 -			<File
  2.3266 -				RelativePath="..\..\src\hermes\HeadMMX.h"
  2.3267 -				>
  2.3268 -			</File>
  2.3269 -			<File
  2.3270 -				RelativePath="..\..\src\hermes\HeadX86.h"
  2.3271 +				RelativePath="..\..\src\libm\math_private.h"
  2.3272  				>
  2.3273  			</File>
  2.3274  			<File
  2.3275 @@ -3574,15 +1131,27 @@
  2.3276  				>
  2.3277  			</File>
  2.3278  			<File
  2.3279 -				RelativePath="..\..\include\SDL.h"
  2.3280 +				RelativePath="..\..\src\events\scancodes_darwin.h"
  2.3281  				>
  2.3282  			</File>
  2.3283  			<File
  2.3284 -				RelativePath="..\..\include\SDL_active.h"
  2.3285 +				RelativePath="..\..\src\events\scancodes_linux.h"
  2.3286  				>
  2.3287  			</File>
  2.3288  			<File
  2.3289 -				RelativePath="..\..\include\SDL_audio.h"
  2.3290 +				RelativePath="..\..\src\events\scancodes_windows.h"
  2.3291 +				>
  2.3292 +			</File>
  2.3293 +			<File
  2.3294 +				RelativePath="..\..\src\events\scancodes_xfree86.h"
  2.3295 +				>
  2.3296 +			</File>
  2.3297 +			<File
  2.3298 +				RelativePath="..\..\src\video\SDL_alphamult.h"
  2.3299 +				>
  2.3300 +			</File>
  2.3301 +			<File
  2.3302 +				RelativePath="..\..\src\SDL_assert_c.h"
  2.3303  				>
  2.3304  			</File>
  2.3305  			<File
  2.3306 @@ -3602,27 +1171,27 @@
  2.3307  				>
  2.3308  			</File>
  2.3309  			<File
  2.3310 -				RelativePath="..\..\include\SDL_byteorder.h"
  2.3311 +				RelativePath="..\..\src\video\SDL_blit_auto.h"
  2.3312  				>
  2.3313  			</File>
  2.3314  			<File
  2.3315 -				RelativePath="..\..\include\SDL_config.h"
  2.3316 +				RelativePath="..\..\src\video\SDL_blit_copy.h"
  2.3317  				>
  2.3318  			</File>
  2.3319  			<File
  2.3320 -				RelativePath="..\..\include\SDL_config_wince.h"
  2.3321 +				RelativePath="..\..\src\video\SDL_blit_slow.h"
  2.3322  				>
  2.3323  			</File>
  2.3324  			<File
  2.3325 -				RelativePath="..\..\include\SDL_copying.h"
  2.3326 +				RelativePath="..\..\src\video\windows\SDL_ceddrawrender.h"
  2.3327  				>
  2.3328  			</File>
  2.3329  			<File
  2.3330 -				RelativePath="..\..\include\SDL_cpuinfo.h"
  2.3331 +				RelativePath="..\..\src\events\SDL_clipboardevents_c.h"
  2.3332  				>
  2.3333  			</File>
  2.3334  			<File
  2.3335 -				RelativePath="..\..\src\video\SDL_cursor_c.h"
  2.3336 +				RelativePath="..\..\src\video\windows\SDL_d3drender.h"
  2.3337  				>
  2.3338  			</File>
  2.3339  			<File
  2.3340 @@ -3630,15 +1199,11 @@
  2.3341  				>
  2.3342  			</File>
  2.3343  			<File
  2.3344 -				RelativePath="..\..\src\video\windib\SDL_dibevents_c.h"
  2.3345 +				RelativePath="..\..\src\audio\disk\SDL_diskaudio.h"
  2.3346  				>
  2.3347  			</File>
  2.3348  			<File
  2.3349 -				RelativePath="..\..\src\video\windib\SDL_dibvideo.h"
  2.3350 -				>
  2.3351 -			</File>
  2.3352 -			<File
  2.3353 -				RelativePath="..\..\src\audio\disk\SDL_diskaudio.h"
  2.3354 +				RelativePath="..\..\src\video\SDL_draw.h"
  2.3355  				>
  2.3356  			</File>
  2.3357  			<File
  2.3358 @@ -3646,22 +1211,10 @@
  2.3359  				>
  2.3360  			</File>
  2.3361  			<File
  2.3362 -				RelativePath="..\..\include\SDL_endian.h"
  2.3363 -				>
  2.3364 -			</File>
  2.3365 -			<File
  2.3366 -				RelativePath="..\..\include\SDL_error.h"
  2.3367 -				>
  2.3368 -			</File>
  2.3369 -			<File
  2.3370  				RelativePath="..\..\src\SDL_error_c.h"
  2.3371  				>
  2.3372  			</File>
  2.3373  			<File
  2.3374 -				RelativePath="..\..\include\SDL_events.h"
  2.3375 -				>
  2.3376 -			</File>
  2.3377 -			<File
  2.3378  				RelativePath="..\..\src\events\SDL_events_c.h"
  2.3379  				>
  2.3380  			</File>
  2.3381 @@ -3670,11 +1223,23 @@
  2.3382  				>
  2.3383  			</File>
  2.3384  			<File
  2.3385 -				RelativePath="..\..\src\video\gapi\sdl_gapivideo.h"
  2.3386 +				RelativePath="..\..\src\video\windows\SDL_gapirender.h"
  2.3387  				>
  2.3388  			</File>
  2.3389  			<File
  2.3390 -				RelativePath="..\..\include\SDL_getenv.h"
  2.3391 +				RelativePath="..\..\src\video\windows\SDL_gapirender_c.h"
  2.3392 +				>
  2.3393 +			</File>
  2.3394 +			<File
  2.3395 +				RelativePath="..\..\src\video\windows\SDL_gdirender.h"
  2.3396 +				>
  2.3397 +			</File>
  2.3398 +			<File
  2.3399 +				RelativePath="..\..\src\events\SDL_gesture_c.h"
  2.3400 +				>
  2.3401 +			</File>
  2.3402 +			<File
  2.3403 +				RelativePath="..\..\src\video\SDL_glesfuncs.h"
  2.3404  				>
  2.3405  			</File>
  2.3406  			<File
  2.3407 @@ -3682,7 +1247,7 @@
  2.3408  				>
  2.3409  			</File>
  2.3410  			<File
  2.3411 -				RelativePath="..\..\include\SDL_joystick.h"
  2.3412 +				RelativePath="..\..\src\haptic\SDL_haptic_c.h"
  2.3413  				>
  2.3414  			</File>
  2.3415  			<File
  2.3416 @@ -3690,11 +1255,7 @@
  2.3417  				>
  2.3418  			</File>
  2.3419  			<File
  2.3420 -				RelativePath="..\..\include\SDL_keyboard.h"
  2.3421 -				>
  2.3422 -			</File>
  2.3423 -			<File
  2.3424 -				RelativePath="..\..\include\SDL_keysym.h"
  2.3425 +				RelativePath="..\..\src\events\SDL_keyboard_c.h"
  2.3426  				>
  2.3427  			</File>
  2.3428  			<File
  2.3429 @@ -3702,39 +1263,11 @@
  2.3430  				>
  2.3431  			</File>
  2.3432  			<File
  2.3433 -				RelativePath="..\..\include\SDL_loadso.h"
  2.3434 +				RelativePath="..\..\src\events\SDL_mouse_c.h"
  2.3435  				>
  2.3436  			</File>
  2.3437  			<File
  2.3438 -				RelativePath="..\..\src\video\wincommon\SDL_lowvideo.h"
  2.3439 -				>
  2.3440 -			</File>
  2.3441 -			<File
  2.3442 -				RelativePath="..\..\include\SDL_main.h"
  2.3443 -				>
  2.3444 -			</File>
  2.3445 -			<File
  2.3446 -				RelativePath="..\..\src\video\SDL_memops.h"
  2.3447 -				>
  2.3448 -			</File>
  2.3449 -			<File
  2.3450 -				RelativePath="..\..\src\audio\SDL_mixer_MMX.h"
  2.3451 -				>
  2.3452 -			</File>
  2.3453 -			<File
  2.3454 -				RelativePath="..\..\src\audio\SDL_mixer_MMX_VC.h"
  2.3455 -				>
  2.3456 -			</File>
  2.3457 -			<File
  2.3458 -				RelativePath="..\..\include\SDL_mouse.h"
  2.3459 -				>
  2.3460 -			</File>
  2.3461 -			<File
  2.3462 -				RelativePath="..\..\include\SDL_mutex.h"
  2.3463 -				>
  2.3464 -			</File>
  2.3465 -			<File
  2.3466 -				RelativePath="..\..\include\SDL_name.h"
  2.3467 +				RelativePath="..\..\src\video\windows\SDL_msctf.h"
  2.3468  				>
  2.3469  			</File>
  2.3470  			<File
  2.3471 @@ -3742,7 +1275,7 @@
  2.3472  				>
  2.3473  			</File>
  2.3474  			<File
  2.3475 -				RelativePath="..\..\src\video\dummy\SDL_nullmouse_c.h"
  2.3476 +				RelativePath="..\..\src\video\dummy\SDL_nullrender_c.h"
  2.3477  				>
  2.3478  			</File>
  2.3479  			<File
  2.3480 @@ -3750,19 +1283,15 @@
  2.3481  				>
  2.3482  			</File>
  2.3483  			<File
  2.3484 -				RelativePath="..\..\include\SDL_opengl.h"
  2.3485 -				>
  2.3486 -			</File>
  2.3487 -			<File
  2.3488  				RelativePath="..\..\src\video\SDL_pixels_c.h"
  2.3489  				>
  2.3490  			</File>
  2.3491  			<File
  2.3492 -				RelativePath="..\..\include\SDL_platform.h"
  2.3493 +				RelativePath="..\..\src\video\SDL_rect_c.h"
  2.3494  				>
  2.3495  			</File>
  2.3496  			<File
  2.3497 -				RelativePath="..\..\include\SDL_quit.h"
  2.3498 +				RelativePath="..\..\src\video\SDL_renderer_sw.h"
  2.3499  				>
  2.3500  			</File>
  2.3501  			<File
  2.3502 @@ -3770,11 +1299,7 @@
  2.3503  				>
  2.3504  			</File>
  2.3505  			<File
  2.3506 -				RelativePath="..\..\include\SDL_rwops.h"
  2.3507 -				>
  2.3508 -			</File>
  2.3509 -			<File
  2.3510 -				RelativePath="..\..\src\video\SDL_stretch_c.h"
  2.3511 +				RelativePath="..\..\src\video\SDL_shape_internals.h"
  2.3512  				>
  2.3513  			</File>
  2.3514  			<File
  2.3515 @@ -3782,11 +1307,11 @@
  2.3516  				>
  2.3517  			</File>
  2.3518  			<File
  2.3519 -				RelativePath="..\..\src\thread\generic\SDL_syscond_c.h"
  2.3520 +				RelativePath="..\..\src\events\SDL_sysevents.h"
  2.3521  				>
  2.3522  			</File>
  2.3523  			<File
  2.3524 -				RelativePath="..\..\src\events\SDL_sysevents.h"
  2.3525 +				RelativePath="..\..\src\haptic\SDL_syshaptic.h"
  2.3526  				>
  2.3527  			</File>
  2.3528  			<File
  2.3529 @@ -3794,27 +1319,11 @@
  2.3530  				>
  2.3531  			</File>
  2.3532  			<File
  2.3533 -				RelativePath="..\..\src\video\wincommon\SDL_sysmouse_c.h"
  2.3534 -				>
  2.3535 -			</File>
  2.3536 -			<File
  2.3537 -				RelativePath="..\..\src\thread\generic\SDL_sysmutex_c.h"
  2.3538 -				>
  2.3539 -			</File>
  2.3540 -			<File
  2.3541 -				RelativePath="..\..\src\thread\generic\SDL_syssem_c.h"
  2.3542 -				>
  2.3543 -			</File>
  2.3544 -			<File
  2.3545  				RelativePath="..\..\src\thread\SDL_systhread.h"
  2.3546  				>
  2.3547  			</File>
  2.3548  			<File
  2.3549 -				RelativePath="..\..\src\thread\generic\SDL_systhread_c.h"
  2.3550 -				>
  2.3551 -			</File>
  2.3552 -			<File
  2.3553 -				RelativePath="..\..\src\thread\win32\SDL_systhread_c.h"
  2.3554 +				RelativePath="..\..\src\thread\windows\SDL_systhread_c.h"
  2.3555  				>
  2.3556  			</File>
  2.3557  			<File
  2.3558 @@ -3826,43 +1335,19 @@
  2.3559  				>
  2.3560  			</File>
  2.3561  			<File
  2.3562 -				RelativePath="..\..\include\SDL_syswm.h"
  2.3563 -				>
  2.3564 -			</File>
  2.3565 -			<File
  2.3566 -				RelativePath="..\..\src\video\wincommon\SDL_syswm_c.h"
  2.3567 -				>
  2.3568 -			</File>
  2.3569 -			<File
  2.3570 -				RelativePath="..\..\include\SDL_thread.h"
  2.3571 -				>
  2.3572 -			</File>
  2.3573 -			<File
  2.3574  				RelativePath="..\..\src\thread\SDL_thread_c.h"
  2.3575  				>
  2.3576  			</File>
  2.3577  			<File
  2.3578 -				RelativePath="..\..\include\SDL_timer.h"
  2.3579 -				>
  2.3580 -			</File>
  2.3581 -			<File
  2.3582  				RelativePath="..\..\src\timer\SDL_timer_c.h"
  2.3583  				>
  2.3584  			</File>
  2.3585  			<File
  2.3586 -				RelativePath="..\..\include\SDL_types.h"
  2.3587 +				RelativePath="..\..\src\events\SDL_touch_c.h"
  2.3588  				>
  2.3589  			</File>
  2.3590  			<File
  2.3591 -				RelativePath="..\..\include\SDL_version.h"
  2.3592 -				>
  2.3593 -			</File>
  2.3594 -			<File
  2.3595 -				RelativePath="..\..\include\SDL_video.h"
  2.3596 -				>
  2.3597 -			</File>
  2.3598 -			<File
  2.3599 -				RelativePath="..\..\src\video\windib\SDL_vkeys.h"
  2.3600 +				RelativePath="..\..\src\video\windows\SDL_vkeys.h"
  2.3601  				>
  2.3602  			</File>
  2.3603  			<File
  2.3604 @@ -3870,7 +1355,47 @@
  2.3605  				>
  2.3606  			</File>
  2.3607  			<File
  2.3608 -				RelativePath="..\..\src\video\wincommon\SDL_wingl_c.h"
  2.3609 +				RelativePath="..\..\src\events\SDL_windowevents_c.h"
  2.3610 +				>
  2.3611 +			</File>
  2.3612 +			<File
  2.3613 +				RelativePath="..\..\src\video\windows\SDL_windowsclipboard.h"
  2.3614 +				>
  2.3615 +			</File>
  2.3616 +			<File
  2.3617 +				RelativePath="..\..\src\video\windows\SDL_windowsevents.h"
  2.3618 +				>
  2.3619 +			</File>
  2.3620 +			<File
  2.3621 +				RelativePath="..\..\src\video\windows\SDL_windowsgamma.h"
  2.3622 +				>
  2.3623 +			</File>
  2.3624 +			<File
  2.3625 +				RelativePath="..\..\src\video\windows\SDL_windowskeyboard.h"
  2.3626 +				>
  2.3627 +			</File>
  2.3628 +			<File
  2.3629 +				RelativePath="..\..\src\video\windows\SDL_windowsmodes.h"
  2.3630 +				>
  2.3631 +			</File>
  2.3632 +			<File
  2.3633 +				RelativePath="..\..\src\video\windows\SDL_windowsmouse.h"
  2.3634 +				>
  2.3635 +			</File>
  2.3636 +			<File
  2.3637 +				RelativePath="..\..\src\video\windows\SDL_windowsopengl.h"
  2.3638 +				>
  2.3639 +			</File>
  2.3640 +			<File
  2.3641 +				RelativePath="..\..\src\video\windows\SDL_windowsshape.h"
  2.3642 +				>
  2.3643 +			</File>
  2.3644 +			<File
  2.3645 +				RelativePath="..\..\src\video\windows\SDL_windowsvideo.h"
  2.3646 +				>
  2.3647 +			</File>
  2.3648 +			<File
  2.3649 +				RelativePath="..\..\src\video\windows\SDL_windowswindow.h"
  2.3650  				>
  2.3651  			</File>
  2.3652  			<File
  2.3653 @@ -3878,15 +1403,11 @@
  2.3654  				>
  2.3655  			</File>
  2.3656  			<File
  2.3657 -				RelativePath="..\..\src\video\SDL_yuvfuncs.h"
  2.3658 +				RelativePath="..\..\src\thread\windows\win_ce_semaphore.h"
  2.3659  				>
  2.3660  			</File>
  2.3661  			<File
  2.3662 -				RelativePath="..\..\src\thread\win32\win_ce_semaphore.h"
  2.3663 -				>
  2.3664 -			</File>
  2.3665 -			<File
  2.3666 -				RelativePath="..\..\src\video\wincommon\wmmsg.h"
  2.3667 +				RelativePath="..\..\src\video\windows\wmmsg.h"
  2.3668  				>
  2.3669  			</File>
  2.3670  		</Filter>
     3.1 --- a/VisualCE/SDLMain/SDLmain.vcproj	Mon Jan 24 15:10:16 2011 -0800
     3.2 +++ b/VisualCE/SDLMain/SDLmain.vcproj	Mon Jan 24 15:46:11 2011 -0800
     3.3 @@ -1,10 +1,11 @@
     3.4  <?xml version="1.0" encoding="windows-1251"?>
     3.5  <VisualStudioProject
     3.6  	ProjectType="Visual C++"
     3.7 -	Version="8,00"
     3.8 +	Version="9.00"
     3.9  	Name="SDLmain"
    3.10  	ProjectGUID="{5AC88B84-5EAA-4C1E-948D-332DA34227F6}"
    3.11  	RootNamespace="SDLmain"
    3.12 +	TargetFrameworkVersion="131072"
    3.13  	>
    3.14  	<Platforms>
    3.15  		<Platform
    3.16 @@ -89,6 +90,9 @@
    3.17  				OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc"
    3.18  			/>
    3.19  			<Tool
    3.20 +				Name="VCFxCopTool"
    3.21 +			/>
    3.22 +			<Tool
    3.23  				Name="VCCodeSignTool"
    3.24  			/>
    3.25  			<Tool
    3.26 @@ -172,6 +176,9 @@
    3.27  				OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc"
    3.28  			/>
    3.29  			<Tool
    3.30 +				Name="VCFxCopTool"
    3.31 +			/>
    3.32 +			<Tool
    3.33  				Name="VCCodeSignTool"
    3.34  			/>
    3.35  			<Tool
    3.36 @@ -255,6 +262,9 @@
    3.37  				OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc"
    3.38  			/>
    3.39  			<Tool
    3.40 +				Name="VCFxCopTool"
    3.41 +			/>
    3.42 +			<Tool
    3.43  				Name="VCCodeSignTool"
    3.44  			/>
    3.45  			<Tool
    3.46 @@ -338,6 +348,9 @@
    3.47  				OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc"
    3.48  			/>
    3.49  			<Tool
    3.50 +				Name="VCFxCopTool"
    3.51 +			/>
    3.52 +			<Tool
    3.53  				Name="VCCodeSignTool"
    3.54  			/>
    3.55  			<Tool
    3.56 @@ -421,6 +434,9 @@
    3.57  				OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc"
    3.58  			/>
    3.59  			<Tool
    3.60 +				Name="VCFxCopTool"
    3.61 +			/>
    3.62 +			<Tool
    3.63  				Name="VCCodeSignTool"
    3.64  			/>
    3.65  			<Tool
    3.66 @@ -507,6 +523,9 @@
    3.67  				OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc"
    3.68  			/>
    3.69  			<Tool
    3.70 +				Name="VCFxCopTool"
    3.71 +			/>
    3.72 +			<Tool
    3.73  				Name="VCCodeSignTool"
    3.74  			/>
    3.75  			<Tool
    3.76 @@ -530,62 +549,8 @@
    3.77  			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
    3.78  			>
    3.79  			<File
    3.80 -				RelativePath="..\..\src\main\win32\SDL_win32_main.c"
    3.81 +				RelativePath="..\..\src\main\windows\SDL_windows_main.c"
    3.82  				>
    3.83 -				<FileConfiguration
    3.84 -					Name="Debug|Smartphone 2003 (ARMV4)"
    3.85 -					>
    3.86 -					<Tool
    3.87 -						Name="VCCLCompilerTool"
    3.88 -						AdditionalIncludeDirectories=""
    3.89 -						UsePrecompiledHeader="0"
    3.90 -					/>
    3.91 -				</FileConfiguration>
    3.92 -				<FileConfiguration
    3.93 -					Name="Debug|Pocket PC 2003 (ARMV4)"
    3.94 -					>
    3.95 -					<Tool
    3.96 -						Name="VCCLCompilerTool"
    3.97 -						AdditionalIncludeDirectories=""
    3.98 -						UsePrecompiledHeader="0"
    3.99 -					/>
   3.100 -				</FileConfiguration>
   3.101 -				<FileConfiguration
   3.102 -					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   3.103 -					>
   3.104 -					<Tool
   3.105 -						Name="VCCLCompilerTool"
   3.106 -						AdditionalIncludeDirectories=""
   3.107 -						UsePrecompiledHeader="0"
   3.108 -					/>
   3.109 -				</FileConfiguration>
   3.110 -				<FileConfiguration
   3.111 -					Name="Release|Smartphone 2003 (ARMV4)"
   3.112 -					>
   3.113 -					<Tool
   3.114 -						Name="VCCLCompilerTool"
   3.115 -						AdditionalIncludeDirectories=""
   3.116 -						UsePrecompiledHeader="0"
   3.117 -					/>
   3.118 -				</FileConfiguration>
   3.119 -				<FileConfiguration
   3.120 -					Name="Release|Pocket PC 2003 (ARMV4)"
   3.121 -					>
   3.122 -					<Tool
   3.123 -						Name="VCCLCompilerTool"
   3.124 -						AdditionalIncludeDirectories=""
   3.125 -						UsePrecompiledHeader="0"
   3.126 -					/>
   3.127 -				</FileConfiguration>
   3.128 -				<FileConfiguration
   3.129 -					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
   3.130 -					>
   3.131 -					<Tool
   3.132 -						Name="VCCLCompilerTool"
   3.133 -						AdditionalIncludeDirectories=""
   3.134 -						UsePrecompiledHeader="0"
   3.135 -					/>
   3.136 -				</FileConfiguration>
   3.137  			</File>
   3.138  		</Filter>
   3.139  		<Filter
     4.1 --- a/VisualCE/loopwave/loopwave.vcproj	Mon Jan 24 15:10:16 2011 -0800
     4.2 +++ b/VisualCE/loopwave/loopwave.vcproj	Mon Jan 24 15:46:11 2011 -0800
     4.3 @@ -1,11 +1,12 @@
     4.4  <?xml version="1.0" encoding="windows-1251"?>
     4.5  <VisualStudioProject
     4.6  	ProjectType="Visual C++"
     4.7 -	Version="8,00"
     4.8 +	Version="9.00"
     4.9  	Name="loopwave"
    4.10  	ProjectGUID="{6F642636-CB11-4DC7-855E-27FE1744003A}"
    4.11  	RootNamespace="loopwave"
    4.12  	Keyword="Win32Proj"
    4.13 +	TargetFrameworkVersion="131072"
    4.14  	>
    4.15  	<Platforms>
    4.16  		<Platform
    4.17 @@ -74,6 +75,8 @@
    4.18  				GenerateDebugInformation="true"
    4.19  				ProgramDatabaseFile="$(OutDir)/loopwave.pdb"
    4.20  				SubSystem="0"
    4.21 +				RandomizedBaseAddress="1"
    4.22 +				DataExecutionPrevention="0"
    4.23  			/>
    4.24  			<Tool
    4.25  				Name="VCALinkTool"
    4.26 @@ -85,6 +88,9 @@
    4.27  				Name="VCBscMakeTool"
    4.28  			/>
    4.29  			<Tool
    4.30 +				Name="VCFxCopTool"
    4.31 +			/>
    4.32 +			<Tool
    4.33  				Name="VCCodeSignTool"
    4.34  			/>
    4.35  			<Tool
    4.36 @@ -125,7 +131,7 @@
    4.37  				Name="VCCLCompilerTool"
    4.38  				ExecutionBucket="7"
    4.39  				Optimization="0"
    4.40 -				AdditionalIncludeDirectories="..\..\nclude"
    4.41 +				AdditionalIncludeDirectories="..\..\include"
    4.42  				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_WINDOWS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
    4.43  				MinimalRebuild="true"
    4.44  				RuntimeLibrary="1"
    4.45 @@ -154,6 +160,8 @@
    4.46  				GenerateDebugInformation="true"
    4.47  				ProgramDatabaseFile="$(OutDir)/loopwave.pdb"
    4.48  				SubSystem="0"
    4.49 +				RandomizedBaseAddress="1"
    4.50 +				DataExecutionPrevention="0"
    4.51  			/>
    4.52  			<Tool
    4.53  				Name="VCALinkTool"
    4.54 @@ -165,6 +173,9 @@
    4.55  				Name="VCBscMakeTool"
    4.56  			/>
    4.57  			<Tool
    4.58 +				Name="VCFxCopTool"
    4.59 +			/>
    4.60 +			<Tool
    4.61  				Name="VCCodeSignTool"
    4.62  			/>
    4.63  			<Tool
    4.64 @@ -236,6 +247,8 @@
    4.65  				SubSystem="0"
    4.66  				OptimizeReferences="2"
    4.67  				EnableCOMDATFolding="2"
    4.68 +				RandomizedBaseAddress="1"
    4.69 +				DataExecutionPrevention="0"
    4.70  			/>
    4.71  			<Tool
    4.72  				Name="VCALinkTool"
    4.73 @@ -247,6 +260,9 @@
    4.74  				Name="VCBscMakeTool"
    4.75  			/>
    4.76  			<Tool
    4.77 +				Name="VCFxCopTool"
    4.78 +			/>
    4.79 +			<Tool
    4.80  				Name="VCCodeSignTool"
    4.81  			/>
    4.82  			<Tool
    4.83 @@ -317,6 +333,8 @@
    4.84  				SubSystem="0"
    4.85  				OptimizeReferences="2"
    4.86  				EnableCOMDATFolding="2"
    4.87 +				RandomizedBaseAddress="1"
    4.88 +				DataExecutionPrevention="0"
    4.89  			/>
    4.90  			<Tool
    4.91  				Name="VCALinkTool"
    4.92 @@ -328,6 +346,9 @@
    4.93  				Name="VCBscMakeTool"
    4.94  			/>
    4.95  			<Tool
    4.96 +				Name="VCFxCopTool"
    4.97 +			/>
    4.98 +			<Tool
    4.99  				Name="VCCodeSignTool"
   4.100  			/>
   4.101  			<Tool
     5.1 --- a/VisualCE/testalpha/testalpha.vcproj	Mon Jan 24 15:10:16 2011 -0800
     5.2 +++ b/VisualCE/testalpha/testalpha.vcproj	Mon Jan 24 15:46:11 2011 -0800
     5.3 @@ -1,10 +1,11 @@
     5.4  <?xml version="1.0" encoding="windows-1251"?>
     5.5  <VisualStudioProject
     5.6  	ProjectType="Visual C++"
     5.7 -	Version="8,00"
     5.8 +	Version="9.00"
     5.9  	Name="testalpha"
    5.10  	ProjectGUID="{DF401CB3-6F70-4485-996B-B7C357CF7EE7}"
    5.11  	RootNamespace="testalpha"
    5.12 +	TargetFrameworkVersion="131072"
    5.13  	>
    5.14  	<Platforms>
    5.15  		<Platform
    5.16 @@ -94,6 +95,8 @@
    5.17  				StackCommitSize="4096"
    5.18  				EntryPointSymbol="WinMainCRTStartup"
    5.19  				BaseAddress="0x00010000"
    5.20 +				RandomizedBaseAddress="1"
    5.21 +				DataExecutionPrevention="0"
    5.22  			/>
    5.23  			<Tool
    5.24  				Name="VCALinkTool"
    5.25 @@ -107,6 +110,9 @@
    5.26  				OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc"
    5.27  			/>
    5.28  			<Tool
    5.29 +				Name="VCFxCopTool"
    5.30 +			/>
    5.31 +			<Tool
    5.32  				Name="VCCodeSignTool"
    5.33  			/>
    5.34  			<Tool
    5.35 @@ -195,6 +201,8 @@
    5.36  				StackCommitSize="4096"
    5.37  				EntryPointSymbol="WinMainCRTStartup"
    5.38  				BaseAddress="0x00010000"
    5.39 +				RandomizedBaseAddress="1"
    5.40 +				DataExecutionPrevention="0"
    5.41  			/>
    5.42  			<Tool
    5.43  				Name="VCALinkTool"
    5.44 @@ -208,6 +216,9 @@
    5.45  				OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc"
    5.46  			/>
    5.47  			<Tool
    5.48 +				Name="VCFxCopTool"
    5.49 +			/>
    5.50 +			<Tool
    5.51  				Name="VCCodeSignTool"
    5.52  			/>
    5.53  			<Tool
    5.54 @@ -300,6 +311,8 @@
    5.55  				LinkTimeCodeGeneration="1"
    5.56  				EntryPointSymbol="WinMainCRTStartup"
    5.57  				BaseAddress="0x00010000"
    5.58 +				RandomizedBaseAddress="1"
    5.59 +				DataExecutionPrevention="0"
    5.60  			/>
    5.61  			<Tool
    5.62  				Name="VCALinkTool"
    5.63 @@ -313,6 +326,9 @@
    5.64  				OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc"
    5.65  			/>
    5.66  			<Tool
    5.67 +				Name="VCFxCopTool"
    5.68 +			/>
    5.69 +			<Tool
    5.70  				Name="VCCodeSignTool"
    5.71  			/>
    5.72  			<Tool
    5.73 @@ -400,6 +416,8 @@
    5.74  				StackCommitSize="4096"
    5.75  				EntryPointSymbol="WinMainCRTStartup"
    5.76  				BaseAddress="0x00010000"
    5.77 +				RandomizedBaseAddress="1"
    5.78 +				DataExecutionPrevention="0"
    5.79  			/>
    5.80  			<Tool
    5.81  				Name="VCALinkTool"
    5.82 @@ -413,6 +431,9 @@
    5.83  				OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc"
    5.84  			/>
    5.85  			<Tool
    5.86 +				Name="VCFxCopTool"
    5.87 +			/>
    5.88 +			<Tool
    5.89  				Name="VCCodeSignTool"
    5.90  			/>
    5.91  			<Tool
    5.92 @@ -500,6 +521,8 @@
    5.93  				StackCommitSize="4096"
    5.94  				EntryPointSymbol="WinMainCRTStartup"
    5.95  				BaseAddress="0x00010000"
    5.96 +				RandomizedBaseAddress="1"
    5.97 +				DataExecutionPrevention="0"
    5.98  			/>
    5.99  			<Tool
   5.100  				Name="VCALinkTool"
   5.101 @@ -513,6 +536,9 @@
   5.102  				OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc"
   5.103  			/>
   5.104  			<Tool
   5.105 +				Name="VCFxCopTool"
   5.106 +			/>
   5.107 +			<Tool
   5.108  				Name="VCCodeSignTool"
   5.109  			/>
   5.110  			<Tool
   5.111 @@ -600,6 +626,8 @@
   5.112  				StackCommitSize="4096"
   5.113  				EntryPointSymbol="WinMainCRTStartup"
   5.114  				BaseAddress="0x00010000"
   5.115 +				RandomizedBaseAddress="1"
   5.116 +				DataExecutionPrevention="0"
   5.117  			/>
   5.118  			<Tool
   5.119  				Name="VCALinkTool"
   5.120 @@ -613,6 +641,9 @@
   5.121  				OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc"
   5.122  			/>
   5.123  			<Tool
   5.124 +				Name="VCFxCopTool"
   5.125 +			/>
   5.126 +			<Tool
   5.127  				Name="VCCodeSignTool"
   5.128  			/>
   5.129  			<Tool
     6.1 --- a/VisualCE/testtimer/testtimer.vcproj	Mon Jan 24 15:10:16 2011 -0800
     6.2 +++ b/VisualCE/testtimer/testtimer.vcproj	Mon Jan 24 15:46:11 2011 -0800
     6.3 @@ -1,11 +1,12 @@
     6.4  <?xml version="1.0" encoding="windows-1251"?>
     6.5  <VisualStudioProject
     6.6  	ProjectType="Visual C++"
     6.7 -	Version="8,00"
     6.8 +	Version="9.00"
     6.9  	Name="testtimer"
    6.10  	ProjectGUID="{D482D7EE-6FF0-4254-9027-C59F8F03AB1F}"
    6.11  	RootNamespace="testtimer"
    6.12  	Keyword="Win32Proj"
    6.13 +	TargetFrameworkVersion="131072"
    6.14  	>
    6.15  	<Platforms>
    6.16  		<Platform
    6.17 @@ -74,6 +75,8 @@
    6.18  				GenerateDebugInformation="true"
    6.19  				ProgramDatabaseFile="$(OutDir)/testtimer.pdb"
    6.20  				SubSystem="0"
    6.21 +				RandomizedBaseAddress="1"
    6.22 +				DataExecutionPrevention="0"
    6.23  			/>
    6.24  			<Tool
    6.25  				Name="VCALinkTool"
    6.26 @@ -85,6 +88,9 @@
    6.27  				Name="VCBscMakeTool"
    6.28  			/>
    6.29  			<Tool
    6.30 +				Name="VCFxCopTool"
    6.31 +			/>
    6.32 +			<Tool
    6.33  				Name="VCCodeSignTool"
    6.34  			/>
    6.35  			<Tool
    6.36 @@ -125,6 +131,7 @@
    6.37  				Name="VCCLCompilerTool"
    6.38  				ExecutionBucket="7"
    6.39  				Optimization="0"
    6.40 +				AdditionalIncludeDirectories="..\..\include"
    6.41  				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_WINDOWS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
    6.42  				MinimalRebuild="true"
    6.43  				RuntimeLibrary="1"
    6.44 @@ -153,6 +160,8 @@
    6.45  				GenerateDebugInformation="true"
    6.46  				ProgramDatabaseFile="$(OutDir)/testtimer.pdb"
    6.47  				SubSystem="0"
    6.48 +				RandomizedBaseAddress="1"
    6.49 +				DataExecutionPrevention="0"
    6.50  			/>
    6.51  			<Tool
    6.52  				Name="VCALinkTool"
    6.53 @@ -164,6 +173,9 @@
    6.54  				Name="VCBscMakeTool"
    6.55  			/>
    6.56  			<Tool
    6.57 +				Name="VCFxCopTool"
    6.58 +			/>
    6.59 +			<Tool
    6.60  				Name="VCCodeSignTool"
    6.61  			/>
    6.62  			<Tool
    6.63 @@ -235,6 +247,8 @@
    6.64  				SubSystem="0"
    6.65  				OptimizeReferences="2"
    6.66  				EnableCOMDATFolding="2"
    6.67 +				RandomizedBaseAddress="1"
    6.68 +				DataExecutionPrevention="0"
    6.69  			/>
    6.70  			<Tool
    6.71  				Name="VCALinkTool"
    6.72 @@ -246,6 +260,9 @@
    6.73  				Name="VCBscMakeTool"
    6.74  			/>
    6.75  			<Tool
    6.76 +				Name="VCFxCopTool"
    6.77 +			/>
    6.78 +			<Tool
    6.79  				Name="VCCodeSignTool"
    6.80  			/>
    6.81  			<Tool
    6.82 @@ -286,6 +303,7 @@
    6.83  				Name="VCCLCompilerTool"
    6.84  				ExecutionBucket="7"
    6.85  				Optimization="2"
    6.86 +				AdditionalIncludeDirectories="..\..\include"
    6.87  				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_WINDOWS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
    6.88  				RuntimeLibrary="0"
    6.89  				UsePrecompiledHeader="0"
    6.90 @@ -315,6 +333,8 @@
    6.91  				SubSystem="0"
    6.92  				OptimizeReferences="2"
    6.93  				EnableCOMDATFolding="2"
    6.94 +				RandomizedBaseAddress="1"
    6.95 +				DataExecutionPrevention="0"
    6.96  			/>
    6.97  			<Tool
    6.98  				Name="VCALinkTool"
    6.99 @@ -326,6 +346,9 @@
   6.100  				Name="VCBscMakeTool"
   6.101  			/>
   6.102  			<Tool
   6.103 +				Name="VCFxCopTool"
   6.104 +			/>
   6.105 +			<Tool
   6.106  				Name="VCCodeSignTool"
   6.107  			/>
   6.108  			<Tool
     7.1 --- a/VisualCE/testwin/testwin.vcproj	Mon Jan 24 15:10:16 2011 -0800
     7.2 +++ b/VisualCE/testwin/testwin.vcproj	Mon Jan 24 15:46:11 2011 -0800
     7.3 @@ -1,10 +1,11 @@
     7.4  <?xml version="1.0" encoding="windows-1251"?>
     7.5  <VisualStudioProject
     7.6  	ProjectType="Visual C++"
     7.7 -	Version="8,00"
     7.8 +	Version="9.00"
     7.9  	Name="testwin"
    7.10  	ProjectGUID="{DC516978-88CB-4F9A-A39A-C351C258613B}"
    7.11  	RootNamespace="testwin"
    7.12 +	TargetFrameworkVersion="131072"
    7.13  	>
    7.14  	<Platforms>
    7.15  		<Platform
    7.16 @@ -93,6 +94,8 @@
    7.17  				StackCommitSize="4096"
    7.18  				EntryPointSymbol="WinMainCRTStartup"
    7.19  				BaseAddress="0x00010000"
    7.20 +				RandomizedBaseAddress="1"
    7.21 +				DataExecutionPrevention="0"
    7.22  			/>
    7.23  			<Tool
    7.24  				Name="VCALinkTool"
    7.25 @@ -106,6 +109,9 @@
    7.26  				OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc"
    7.27  			/>
    7.28  			<Tool
    7.29 +				Name="VCFxCopTool"
    7.30 +			/>
    7.31 +			<Tool
    7.32  				Name="VCCodeSignTool"
    7.33  			/>
    7.34  			<Tool
    7.35 @@ -194,6 +200,8 @@
    7.36  				StackCommitSize="4096"
    7.37  				EntryPointSymbol="WinMainCRTStartup"
    7.38  				BaseAddress="0x00010000"
    7.39 +				RandomizedBaseAddress="1"
    7.40 +				DataExecutionPrevention="0"
    7.41  			/>
    7.42  			<Tool
    7.43  				Name="VCALinkTool"
    7.44 @@ -207,6 +215,9 @@
    7.45  				OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc"
    7.46  			/>
    7.47  			<Tool
    7.48 +				Name="VCFxCopTool"
    7.49 +			/>
    7.50 +			<Tool
    7.51  				Name="VCCodeSignTool"
    7.52  			/>
    7.53  			<Tool
    7.54 @@ -295,6 +306,8 @@
    7.55  				StackCommitSize="4096"
    7.56  				EntryPointSymbol="WinMainCRTStartup"
    7.57  				BaseAddress="0x00010000"
    7.58 +				RandomizedBaseAddress="1"
    7.59 +				DataExecutionPrevention="0"
    7.60  			/>
    7.61  			<Tool
    7.62  				Name="VCALinkTool"
    7.63 @@ -308,6 +321,9 @@
    7.64  				OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc"
    7.65  			/>
    7.66  			<Tool
    7.67 +				Name="VCFxCopTool"
    7.68 +			/>
    7.69 +			<Tool
    7.70  				Name="VCCodeSignTool"
    7.71  			/>
    7.72  			<Tool
    7.73 @@ -395,6 +411,8 @@
    7.74  				StackCommitSize="4096"
    7.75  				EntryPointSymbol="WinMainCRTStartup"
    7.76  				BaseAddress="0x00010000"
    7.77 +				RandomizedBaseAddress="1"
    7.78 +				DataExecutionPrevention="0"
    7.79  			/>
    7.80  			<Tool
    7.81  				Name="VCALinkTool"
    7.82 @@ -408,6 +426,9 @@
    7.83  				OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc"
    7.84  			/>
    7.85  			<Tool
    7.86 +				Name="VCFxCopTool"
    7.87 +			/>
    7.88 +			<Tool
    7.89  				Name="VCCodeSignTool"
    7.90  			/>
    7.91  			<Tool
    7.92 @@ -495,6 +516,8 @@
    7.93  				StackCommitSize="4096"
    7.94  				EntryPointSymbol="WinMainCRTStartup"
    7.95  				BaseAddress="0x00010000"
    7.96 +				RandomizedBaseAddress="1"
    7.97 +				DataExecutionPrevention="0"
    7.98  			/>
    7.99  			<Tool
   7.100  				Name="VCALinkTool"
   7.101 @@ -508,6 +531,9 @@
   7.102  				OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc"
   7.103  			/>
   7.104  			<Tool
   7.105 +				Name="VCFxCopTool"
   7.106 +			/>
   7.107 +			<Tool
   7.108  				Name="VCCodeSignTool"
   7.109  			/>
   7.110  			<Tool
   7.111 @@ -595,6 +621,8 @@
   7.112  				StackCommitSize="4096"
   7.113  				EntryPointSymbol="WinMainCRTStartup"
   7.114  				BaseAddress="0x00010000"
   7.115 +				RandomizedBaseAddress="1"
   7.116 +				DataExecutionPrevention="0"
   7.117  			/>
   7.118  			<Tool
   7.119  				Name="VCALinkTool"
   7.120 @@ -608,6 +636,9 @@
   7.121  				OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc"
   7.122  			/>
   7.123  			<Tool
   7.124 +				Name="VCFxCopTool"
   7.125 +			/>
   7.126 +			<Tool
   7.127  				Name="VCCodeSignTool"
   7.128  			/>
   7.129  			<Tool
     8.1 --- a/include/SDL_assert.h	Mon Jan 24 15:10:16 2011 -0800
     8.2 +++ b/include/SDL_assert.h	Mon Jan 24 15:46:11 2011 -0800
     8.3 @@ -50,7 +50,7 @@
     8.4  assert can have unique static variables associated with it.
     8.5  */
     8.6  
     8.7 -#if defined(_MSC_VER)
     8.8 +#if defined(_MSC_VER) && !defined(_WIN32_WCE)
     8.9  #include <intrin.h>
    8.10      #define SDL_TriggerBreakpoint() __debugbreak()
    8.11  #elif (defined(__GNUC__) && ((__i386__) || (__x86_64__)))
     9.1 --- a/include/SDL_atomic.h	Mon Jan 24 15:10:16 2011 -0800
     9.2 +++ b/include/SDL_atomic.h	Mon Jan 24 15:46:11 2011 -0800
     9.3 @@ -58,7 +58,7 @@
     9.4  
     9.5  /* Need to do this here because intrin.h has C++ code in it */
     9.6  /* Visual Studio 2005 has a bug where intrin.h conflicts with winnt.h */
     9.7 -#if defined(_MSC_VER) && (_MSC_VER >= 1500)
     9.8 +#if defined(_MSC_VER) && (_MSC_VER >= 1500) && !defined(_WIN32_WCE)
     9.9  #include <intrin.h>
    9.10  #define HAVE_MSC_ATOMICS
    9.11  #endif
    10.1 --- a/include/SDL_compat.h	Mon Jan 24 15:10:16 2011 -0800
    10.2 +++ b/include/SDL_compat.h	Mon Jan 24 15:46:11 2011 -0800
    10.3 @@ -65,7 +65,7 @@
    10.4  /*@{*/
    10.5  
    10.6  /* Platform */
    10.7 -#ifdef __WINDOWS__
    10.8 +#ifdef __WIN32__
    10.9  #undef __WIN32__
   10.10  #define __WIN32__   1
   10.11  #endif
    11.1 --- a/include/SDL_config_windows.h	Mon Jan 24 15:10:16 2011 -0800
    11.2 +++ b/include/SDL_config_windows.h	Mon Jan 24 15:46:11 2011 -0800
    11.3 @@ -20,8 +20,8 @@
    11.4      slouken@libsdl.org
    11.5  */
    11.6  
    11.7 -#ifndef _SDL_config_windows2_h
    11.8 -#define _SDL_config_windows2_h
    11.9 +#ifndef _SDL_config_windows_h
   11.10 +#define _SDL_config_windows_h
   11.11  
   11.12  #include "SDL_platform.h"
   11.13  
   11.14 @@ -178,7 +178,11 @@
   11.15  #define SDL_VIDEO_DRIVER_DUMMY	1
   11.16  #define SDL_VIDEO_DRIVER_WINDOWS	1
   11.17  
   11.18 +#ifdef _WIN32_WCE
   11.19 +#define SDL_VIDEO_RENDER_GAPI	1
   11.20 +#else
   11.21  #define SDL_VIDEO_RENDER_D3D	1
   11.22 +#endif
   11.23  #define SDL_VIDEO_RENDER_GDI	1
   11.24  
   11.25  /* Enable OpenGL support */
   11.26 @@ -196,4 +200,4 @@
   11.27  #define SDL_ASSEMBLY_ROUTINES	1
   11.28  #endif
   11.29  
   11.30 -#endif /* _SDL_config_windows2_h */
   11.31 +#endif /* _SDL_config_windows_h */
    12.1 --- a/include/SDL_main.h	Mon Jan 24 15:10:16 2011 -0800
    12.2 +++ b/include/SDL_main.h	Mon Jan 24 15:46:11 2011 -0800
    12.3 @@ -31,7 +31,7 @@
    12.4   *  Redefine main() on some platforms so that it is called by SDL.
    12.5   */
    12.6  
    12.7 -#if defined(__WINDOWS__) || \
    12.8 +#if defined(__WIN32__) || \
    12.9      (defined(__MWERKS__) && !defined(__BEOS__)) || \
   12.10      defined(__SYMBIAN32__) || defined(__IPHONEOS__) || \
   12.11      defined(__ANDROID__)
   12.12 @@ -66,7 +66,7 @@
   12.13  
   12.14  
   12.15  /* From the SDL library code -- needed for registering the app on Win32 */
   12.16 -#ifdef __WINDOWS__
   12.17 +#ifdef __WIN32__
   12.18  
   12.19  #include "begin_code.h"
   12.20  #ifdef __cplusplus
    13.1 --- a/include/SDL_opengl.h	Mon Jan 24 15:10:16 2011 -0800
    13.2 +++ b/include/SDL_opengl.h	Mon Jan 24 15:46:11 2011 -0800
    13.3 @@ -31,7 +31,7 @@
    13.4  
    13.5  #include "SDL_config.h"
    13.6  
    13.7 -#ifdef __WINDOWS__
    13.8 +#ifdef __WIN32__
    13.9  #define WIN32_LEAN_AND_MEAN
   13.10  #ifndef NOMINMAX
   13.11  #define NOMINMAX                /* Don't defined min() and max() */
    14.1 --- a/include/SDL_platform.h	Mon Jan 24 15:10:16 2011 -0800
    14.2 +++ b/include/SDL_platform.h	Mon Jan 24 15:46:11 2011 -0800
    14.3 @@ -125,8 +125,8 @@
    14.4  #define __SOLARIS__	1
    14.5  #endif
    14.6  #if defined(WIN32) || defined(_WIN32)
    14.7 -#undef __WINDOWS__
    14.8 -#define __WINDOWS__	1
    14.9 +#undef __WIN32__
   14.10 +#define __WIN32__	1
   14.11  #endif
   14.12  
   14.13  #if defined(__NDS__)
    15.1 --- a/include/SDL_rwops.h	Mon Jan 24 15:10:16 2011 -0800
    15.2 +++ b/include/SDL_rwops.h	Mon Jan 24 15:46:11 2011 -0800
    15.3 @@ -83,7 +83,7 @@
    15.4      Uint32 type;
    15.5      union
    15.6      {
    15.7 -#ifdef __WINDOWS__
    15.8 +#ifdef __WIN32__
    15.9          struct
   15.10          {
   15.11              SDL_bool append;
    16.1 --- a/include/SDL_thread.h	Mon Jan 24 15:10:16 2011 -0800
    16.2 +++ b/include/SDL_thread.h	Mon Jan 24 15:46:11 2011 -0800
    16.3 @@ -55,7 +55,7 @@
    16.4   */
    16.5  typedef int (SDLCALL * SDL_ThreadFunction) (void *data);
    16.6  
    16.7 -#if defined(__WINDOWS__) && !defined(HAVE_LIBC)
    16.8 +#if defined(__WIN32__) && !defined(HAVE_LIBC)
    16.9  /**
   16.10   *  \file SDL_thread.h
   16.11   *  
    17.1 --- a/include/begin_code.h	Mon Jan 24 15:10:16 2011 -0800
    17.2 +++ b/include/begin_code.h	Mon Jan 24 15:46:11 2011 -0800
    17.3 @@ -42,7 +42,7 @@
    17.4  #  else
    17.5  #   define DECLSPEC	__declspec(export)
    17.6  #  endif
    17.7 -# elif defined(__WINDOWS__)
    17.8 +# elif defined(__WIN32__)
    17.9  #  ifdef __BORLANDC__
   17.10  #   ifdef BUILD_SDL
   17.11  #    define DECLSPEC
   17.12 @@ -63,7 +63,7 @@
   17.13  
   17.14  /* By default SDL uses the C calling convention */
   17.15  #ifndef SDLCALL
   17.16 -#if defined(__WINDOWS__) && !defined(__GNUC__)
   17.17 +#if defined(__WIN32__) && !defined(__GNUC__)
   17.18  #define SDLCALL __cdecl
   17.19  #else
   17.20  #define SDLCALL
    18.1 --- a/src/SDL.c	Mon Jan 24 15:10:16 2011 -0800
    18.2 +++ b/src/SDL.c	Mon Jan 24 15:46:11 2011 -0800
    18.3 @@ -39,7 +39,7 @@
    18.4  extern int SDL_TimerInit(void);
    18.5  extern void SDL_TimerQuit(void);
    18.6  #endif
    18.7 -#if defined(__WINDOWS__)
    18.8 +#if defined(__WIN32__)
    18.9  extern int SDL_HelperWindowCreate(void);
   18.10  extern int SDL_HelperWindowDestroy(void);
   18.11  #endif
   18.12 @@ -147,7 +147,7 @@
   18.13      /* Clear the error message */
   18.14      SDL_ClearError();
   18.15  
   18.16 -#if defined(__WINDOWS__)
   18.17 +#if defined(__WIN32__)
   18.18      if (SDL_HelperWindowCreate() < 0) {
   18.19          return -1;
   18.20      }
   18.21 @@ -220,7 +220,7 @@
   18.22      fflush(stdout);
   18.23  #endif
   18.24  
   18.25 -#if defined(__WINDOWS__)
   18.26 +#if defined(__WIN32__)
   18.27      SDL_HelperWindowDestroy();
   18.28  #endif
   18.29      SDL_QuitSubSystem(SDL_INIT_EVERYTHING);
   18.30 @@ -312,7 +312,7 @@
   18.31      return "RISC OS";
   18.32  #elif __SOLARIS__
   18.33      return "Solaris";
   18.34 -#elif __WINDOWS__
   18.35 +#elif __WIN32__
   18.36  #ifdef _WIN32_WCE
   18.37      return "Windows CE";
   18.38  #else
   18.39 @@ -325,7 +325,7 @@
   18.40  #endif
   18.41  }
   18.42  
   18.43 -#if defined(__WINDOWS__)
   18.44 +#if defined(__WIN32__)
   18.45  
   18.46  #if !defined(HAVE_LIBC) || (defined(__WATCOMC__) && defined(BUILD_DLL))
   18.47  /* Need to include DllMain() on Watcom C for some reason.. */
   18.48 @@ -347,6 +347,6 @@
   18.49  }
   18.50  #endif /* building DLL with Watcom C */
   18.51  
   18.52 -#endif /* __WINDOWS__ */
   18.53 +#endif /* __WIN32__ */
   18.54  
   18.55  /* vi: set ts=4 sw=4 expandtab: */
    19.1 --- a/src/SDL_assert.c	Mon Jan 24 15:10:16 2011 -0800
    19.2 +++ b/src/SDL_assert.c	Mon Jan 24 15:46:11 2011 -0800
    19.3 @@ -26,9 +26,19 @@
    19.4  #include "SDL_assert_c.h"
    19.5  #include "video/SDL_sysvideo.h"
    19.6  
    19.7 -#ifdef __WINDOWS__
    19.8 +#ifdef __WIN32__
    19.9  #define WIN32_LEAN_AND_MEAN
   19.10  #include <windows.h>
   19.11 +
   19.12 +#ifndef WS_OVERLAPPEDWINDOW
   19.13 +#define WS_OVERLAPPEDWINDOW 0
   19.14 +#endif
   19.15 +
   19.16 +#ifdef UNICODE
   19.17 +#define WIN_UTF8ToString(S) (WCHAR *)SDL_iconv_string("UCS-2", "UTF-8", (char *)S, SDL_strlen(S)+1)
   19.18 +#else
   19.19 +#define WIN_UTF8ToString(S) SDL_iconv_string("ASCII", "UTF-8", (char *)S, SDL_strlen(S)+1)
   19.20 +#endif
   19.21  #else  /* fprintf, _exit(), etc. */
   19.22  #include <stdio.h>
   19.23  #include <stdlib.h>
   19.24 @@ -57,11 +67,12 @@
   19.25  static void
   19.26  debug_print(const char *fmt, ...)
   19.27  {
   19.28 -#ifdef __WINDOWS__
   19.29 +#ifdef __WIN32__
   19.30      /* Format into a buffer for OutputDebugStringA(). */
   19.31      char buf[1024];
   19.32      char *startptr;
   19.33      char *ptr;
   19.34 +    LPTSTR tstr;
   19.35      int len;
   19.36      va_list ap;
   19.37      va_start(ap, fmt);
   19.38 @@ -78,15 +89,19 @@
   19.39      for (ptr = startptr; *ptr; ptr++) {
   19.40          if (*ptr == '\n') {
   19.41              *ptr = '\0';
   19.42 -            OutputDebugStringA(startptr);
   19.43 -            OutputDebugStringA("\r\n");
   19.44 +            tstr = WIN_UTF8ToString(startptr);
   19.45 +            OutputDebugString(tstr);
   19.46 +            SDL_free(tstr);
   19.47 +            OutputDebugString(TEXT("\r\n"));
   19.48              startptr = ptr+1;
   19.49          }
   19.50      }
   19.51  
   19.52      /* catch that last piece if it didn't have a newline... */
   19.53      if (startptr != ptr) {
   19.54 -        OutputDebugStringA(startptr);
   19.55 +        tstr = WIN_UTF8ToString(startptr);
   19.56 +        OutputDebugString(tstr);
   19.57 +        SDL_free(tstr);
   19.58      }
   19.59  #else
   19.60      /* Unix has it easy. Just dump it to stderr. */
   19.61 @@ -99,7 +114,7 @@
   19.62  }
   19.63  
   19.64  
   19.65 -#ifdef __WINDOWS__
   19.66 +#ifdef __WIN32__
   19.67  static SDL_assert_state SDL_Windows_AssertChoice = SDL_ASSERTION_ABORT;
   19.68  static const SDL_assert_data *SDL_Windows_AssertData = NULL;
   19.69  
   19.70 @@ -113,6 +128,7 @@
   19.71              /* !!! FIXME: all this code stinks. */
   19.72              const SDL_assert_data *data = SDL_Windows_AssertData;
   19.73              char buf[1024];
   19.74 +            LPTSTR tstr;
   19.75              const int w = 100;
   19.76              const int h = 25;
   19.77              const int gap = 10;
   19.78 @@ -121,14 +137,14 @@
   19.79              int len;
   19.80              int i;
   19.81              static const struct { 
   19.82 -                const char *name;
   19.83 +                LPCTSTR name;
   19.84                  SDL_assert_state state;
   19.85              } buttons[] = {
   19.86 -                {"Abort", SDL_ASSERTION_ABORT },
   19.87 -                {"Break", SDL_ASSERTION_BREAK },
   19.88 -                {"Retry", SDL_ASSERTION_RETRY },
   19.89 -                {"Ignore", SDL_ASSERTION_IGNORE },
   19.90 -                {"Always Ignore", SDL_ASSERTION_ALWAYS_IGNORE },
   19.91 +                {TEXT("Abort"), SDL_ASSERTION_ABORT },
   19.92 +                {TEXT("Break"), SDL_ASSERTION_BREAK },
   19.93 +                {TEXT("Retry"), SDL_ASSERTION_RETRY },
   19.94 +                {TEXT("Ignore"), SDL_ASSERTION_IGNORE },
   19.95 +                {TEXT("Always Ignore"), SDL_ASSERTION_ALWAYS_IGNORE },
   19.96              };
   19.97  
   19.98              len = (int) SDL_snprintf(buf, sizeof (buf), 
   19.99 @@ -140,14 +156,16 @@
  19.100                  buf[sizeof (buf) - 1] = '\0';
  19.101              }
  19.102  
  19.103 -            CreateWindowA("STATIC", buf,
  19.104 +            tstr = WIN_UTF8ToString(buf);
  19.105 +            CreateWindow(TEXT("STATIC"), tstr,
  19.106                           WS_VISIBLE | WS_CHILD | SS_LEFT,
  19.107                           x, y, 550, 100,
  19.108                           hwnd, (HMENU) 1, NULL, NULL);
  19.109 +            SDL_free(tstr);
  19.110              y += 110;
  19.111  
  19.112              for (i = 0; i < (sizeof (buttons) / sizeof (buttons[0])); i++) {
  19.113 -                CreateWindowA("BUTTON", buttons[i].name,
  19.114 +                CreateWindow(TEXT("BUTTON"), buttons[i].name,
  19.115                           WS_VISIBLE | WS_CHILD,
  19.116                           x, y, w, h,
  19.117                           hwnd, (HMENU) buttons[i].state, NULL, NULL);
  19.118 @@ -248,7 +266,7 @@
  19.119  
  19.120  static void SDL_ExitProcess(int exitcode)
  19.121  {
  19.122 -#ifdef __WINDOWS__
  19.123 +#ifdef __WIN32__
  19.124      ExitProcess(42);
  19.125  #else
  19.126      _exit(42);
  19.127 @@ -311,7 +329,7 @@
  19.128  
  19.129      /* platform-specific UI... */
  19.130  
  19.131 -#ifdef __WINDOWS__
  19.132 +#ifdef __WIN32__
  19.133      state = SDL_PromptAssertion_windows(data);
  19.134  
  19.135  #elif __MACOSX__
    20.1 --- a/src/atomic/SDL_spinlock.c	Mon Jan 24 15:10:16 2011 -0800
    20.2 +++ b/src/atomic/SDL_spinlock.c	Mon Jan 24 15:46:11 2011 -0800
    20.3 @@ -26,8 +26,13 @@
    20.4  
    20.5  /* Don't do the check for Visual Studio 2005, it's safe here */
    20.6  #if defined(_MSC_VER)
    20.7 +#ifdef _WIN32_WCE
    20.8 +#define WIN32_LEAN_AND_MEAN
    20.9 +#include <windows.h>
   20.10 +#else
   20.11  #include <intrin.h>
   20.12  #endif
   20.13 +#endif /* _MSC_VER */
   20.14  
   20.15  /* This function is where all the magic happens... */
   20.16  SDL_bool
    21.1 --- a/src/audio/SDL_audio.c	Mon Jan 24 15:10:16 2011 -0800
    21.2 +++ b/src/audio/SDL_audio.c	Mon Jan 24 15:46:11 2011 -0800
    21.3 @@ -971,7 +971,7 @@
    21.4      if (!current_audio.impl.ProvidesOwnCallbackThread) {
    21.5          /* Start the audio thread */
    21.6  /* !!! FIXME: this is nasty. */
    21.7 -#if (defined(__WINDOWS__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC)
    21.8 +#if (defined(__WIN32__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC)
    21.9  #undef SDL_CreateThread
   21.10          device->thread = SDL_CreateThread(SDL_RunAudio, device, NULL, NULL);
   21.11  #else
    22.1 --- a/src/cpuinfo/SDL_cpuinfo.c	Mon Jan 24 15:10:16 2011 -0800
    22.2 +++ b/src/cpuinfo/SDL_cpuinfo.c	Mon Jan 24 15:46:11 2011 -0800
    22.3 @@ -38,7 +38,7 @@
    22.4  #include <signal.h>
    22.5  #include <setjmp.h>
    22.6  #endif
    22.7 -#ifdef __WINDOWS__
    22.8 +#ifdef __WIN32__
    22.9  #define WIN32_LEAN_AND_MEAN
   22.10  #include <windows.h>
   22.11  #endif
   22.12 @@ -319,7 +319,7 @@
   22.13              sysctlbyname("hw.ncpu", &SDL_CPUCount, &size, NULL, 0);
   22.14          }
   22.15  #endif
   22.16 -#ifdef __WINDOWS__
   22.17 +#ifdef __WIN32__
   22.18          if (SDL_CPUCount <= 0) {
   22.19              SYSTEM_INFO info;
   22.20              GetSystemInfo(&info);
    23.1 --- a/src/events/SDL_events.c	Mon Jan 24 15:10:16 2011 -0800
    23.2 +++ b/src/events/SDL_events.c	Mon Jan 24 15:46:11 2011 -0800
    23.3 @@ -170,7 +170,7 @@
    23.4  
    23.5          /* The event thread will handle timers too */
    23.6          SDL_SetTimerThreaded(2);
    23.7 -#if (defined(__WINDOWS__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC)
    23.8 +#if (defined(__WIN32__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC)
    23.9  #undef SDL_CreateThread
   23.10          SDL_EventThread =
   23.11              SDL_CreateThread(SDL_GobbleEvents, NULL, NULL, NULL);
    24.1 --- a/src/events/SDL_sysevents.h	Mon Jan 24 15:10:16 2011 -0800
    24.2 +++ b/src/events/SDL_sysevents.h	Mon Jan 24 15:46:11 2011 -0800
    24.3 @@ -29,7 +29,7 @@
    24.4  #define MUST_THREAD_EVENTS
    24.5  #endif
    24.6  
    24.7 -#ifdef __WINDOWS__              /* Windows doesn't allow a separate event thread */
    24.8 +#ifdef __WIN32__              /* Windows doesn't allow a separate event thread */
    24.9  #define CANT_THREAD_EVENTS
   24.10  #endif
   24.11  
    25.1 --- a/src/file/SDL_rwops.c	Mon Jan 24 15:10:16 2011 -0800
    25.2 +++ b/src/file/SDL_rwops.c	Mon Jan 24 15:46:11 2011 -0800
    25.3 @@ -37,7 +37,7 @@
    25.4  #include <fat.h>
    25.5  #endif /* __NDS__ */
    25.6  
    25.7 -#ifdef __WINDOWS__
    25.8 +#ifdef __WIN32__
    25.9  
   25.10  /* Functions to read/write Win32 API file pointers */
   25.11  /* Will not use it on WinCE because stdio is buffered, it means
   25.12 @@ -295,7 +295,7 @@
   25.13      }
   25.14      return (0);
   25.15  }
   25.16 -#endif /* __WINDOWS__ */
   25.17 +#endif /* __WIN32__ */
   25.18  
   25.19  #ifdef HAVE_STDIO_H
   25.20  
   25.21 @@ -449,7 +449,7 @@
   25.22          SDL_SetError("SDL_RWFromFile(): No file or no mode specified");
   25.23          return NULL;
   25.24      }
   25.25 -#if defined(__WINDOWS__)
   25.26 +#if defined(__WIN32__)
   25.27      rwops = SDL_AllocRW();
   25.28      if (!rwops)
   25.29          return NULL;            /* SDL_SetError already setup by SDL_AllocRW() */
    26.1 --- a/src/libm/math_private.h	Mon Jan 24 15:10:16 2011 -0800
    26.2 +++ b/src/libm/math_private.h	Mon Jan 24 15:46:11 2011 -0800
    26.3 @@ -19,7 +19,7 @@
    26.4  
    26.5  /*#include <endian.h>*/
    26.6  #include "SDL_endian.h"
    26.7 -#include <sys/types.h>
    26.8 +/*#include <sys/types.h>*/
    26.9  
   26.10  #define attribute_hidden
   26.11  #define libm_hidden_proto(x)
    27.1 --- a/src/loadso/windows/SDL_sysloadso.c	Mon Jan 24 15:10:16 2011 -0800
    27.2 +++ b/src/loadso/windows/SDL_sysloadso.c	Mon Jan 24 15:46:11 2011 -0800
    27.3 @@ -61,7 +61,7 @@
    27.4      SDL_free(sofile_t);
    27.5      SDL_free(errbuf_t);
    27.6  
    27.7 -#else /*if defined(__WINDOWS__) */
    27.8 +#else /*if defined(__WIN32__) */
    27.9      char errbuf[512];
   27.10  
   27.11      handle = (void *) LoadLibrary(sofile);
    28.1 --- a/src/power/windows/SDL_syspower.c	Mon Jan 24 15:10:16 2011 -0800
    28.2 +++ b/src/power/windows/SDL_syspower.c	Mon Jan 24 15:46:11 2011 -0800
    28.3 @@ -32,11 +32,20 @@
    28.4  SDL_bool
    28.5  SDL_GetPowerInfo_Windows(SDL_PowerState * state, int *seconds, int *percent)
    28.6  {
    28.7 +#ifdef _WIN32_WCE
    28.8 +    SYSTEM_POWER_STATUS_EX status;
    28.9 +#else
   28.10      SYSTEM_POWER_STATUS status;
   28.11 +#endif
   28.12      SDL_bool need_details = SDL_FALSE;
   28.13  
   28.14      /* This API should exist back to Win95 and Windows CE. */
   28.15 -    if (!GetSystemPowerStatus(&status)) {
   28.16 +#ifdef _WIN32_WCE
   28.17 +    if (!GetSystemPowerStatusEx(&status, FALSE))
   28.18 +#else
   28.19 +    if (!GetSystemPowerStatus(&status))
   28.20 +#endif
   28.21 +    {
   28.22          /* !!! FIXME: push GetLastError() into SDL_GetError() */
   28.23          *state = SDL_POWERSTATE_UNKNOWN;
   28.24      } else if (status.BatteryFlag == 0xFF) {    /* unknown state */
    29.1 --- a/src/stdlib/SDL_getenv.c	Mon Jan 24 15:10:16 2011 -0800
    29.2 +++ b/src/stdlib/SDL_getenv.c	Mon Jan 24 15:46:11 2011 -0800
    29.3 @@ -25,7 +25,7 @@
    29.4  
    29.5  #ifndef HAVE_GETENV
    29.6  
    29.7 -#if defined(__WINDOWS__) && !defined(_WIN32_WCE)
    29.8 +#if defined(__WIN32__) && !defined(_WIN32_WCE)
    29.9  
   29.10  #define WIN32_LEAN_AND_MEAN
   29.11  #include <windows.h>
   29.12 @@ -163,7 +163,7 @@
   29.13      return value;
   29.14  }
   29.15  
   29.16 -#endif /* __WINDOWS__ */
   29.17 +#endif /* __WIN32__ */
   29.18  
   29.19  #endif /* !HAVE_GETENV */
   29.20  
    30.1 --- a/src/stdlib/SDL_stdlib.c	Mon Jan 24 15:10:16 2011 -0800
    30.2 +++ b/src/stdlib/SDL_stdlib.c	Mon Jan 24 15:46:11 2011 -0800
    30.3 @@ -35,9 +35,7 @@
    30.4  __declspec(selectany) int _fltused = 1;
    30.5  #endif
    30.6  
    30.7 -#ifdef _WIN64
    30.8 -
    30.9 -#else
   30.10 +#ifdef _M_IX86
   30.11  
   30.12  void
   30.13  __declspec(naked)
    31.1 --- a/src/thread/windows/SDL_syssem.c	Mon Jan 24 15:10:16 2011 -0800
    31.2 +++ b/src/thread/windows/SDL_syssem.c	Mon Jan 24 15:46:11 2011 -0800
    31.3 @@ -39,7 +39,7 @@
    31.4  #else
    31.5      HANDLE id;
    31.6  #endif
    31.7 -    LONG volatile count;
    31.8 +    LONG count;
    31.9  };
   31.10  
   31.11  
    32.1 --- a/src/thread/windows/SDL_systhread.c	Mon Jan 24 15:10:16 2011 -0800
    32.2 +++ b/src/thread/windows/SDL_systhread.c	Mon Jan 24 15:46:11 2011 -0800
    32.3 @@ -23,12 +23,10 @@
    32.4  
    32.5  /* Win32 thread management routines for SDL */
    32.6  
    32.7 -#define WIN32_LEAN_AND_MEAN
    32.8 -#include <windows.h>
    32.9 -
   32.10  #include "SDL_thread.h"
   32.11  #include "../SDL_thread_c.h"
   32.12  #include "../SDL_systhread.h"
   32.13 +#include "SDL_systhread_c.h"
   32.14  
   32.15  #ifndef SDL_PASSED_BEGINTHREAD_ENDTHREAD
   32.16  #ifndef _WIN32_WCE
    33.1 --- a/src/video/SDL_renderer_gl.c	Mon Jan 24 15:10:16 2011 -0800
    33.2 +++ b/src/video/SDL_renderer_gl.c	Mon Jan 24 15:46:11 2011 -0800
    33.3 @@ -1181,7 +1181,7 @@
    33.4          }
    33.5          data->glEnd();
    33.6      } else {
    33.7 -#if defined(__APPLE__) || defined(__WINDOWS__)
    33.8 +#if defined(__APPLE__) || defined(__WIN32__)
    33.9  #else
   33.10          int x1, y1, x2, y2;
   33.11  #endif
   33.12 @@ -1200,7 +1200,7 @@
   33.13           * least it would be pixel perfect.
   33.14           */
   33.15          data->glBegin(GL_POINTS);
   33.16 -#if defined(__APPLE__) || defined(__WINDOWS__)
   33.17 +#if defined(__APPLE__) || defined(__WIN32__)
   33.18          /* Mac OS X and Windows seem to always leave the second point open */
   33.19          data->glVertex2f(0.5f + points[count-1].x, 0.5f + points[count-1].y);
   33.20  #else
    34.1 --- a/src/video/windows/SDL_gapirender.c	Mon Jan 24 15:10:16 2011 -0800
    34.2 +++ b/src/video/windows/SDL_gapirender.c	Mon Jan 24 15:46:11 2011 -0800
    34.3 @@ -92,19 +92,19 @@
    34.4  //#define DM_DISPLAYORIENTATION 0x00800000L
    34.5  //#endif
    34.6  
    34.7 -#define FORMAT_565		1
    34.8 -#define FORMAT_555		2
    34.9 -#define FORMAT_OTHER		3
   34.10 +#define FORMAT_565                1
   34.11 +#define FORMAT_555                2
   34.12 +#define FORMAT_OTHER                3
   34.13  
   34.14 -#define GETRAWFRAMEBUFFER	0x00020001
   34.15 -#define GETGXINFO		0x00020000
   34.16 +#define GETRAWFRAMEBUFFER        0x00020001
   34.17 +#define GETGXINFO                0x00020000
   34.18  
   34.19 -#define kfPalette		0x10
   34.20 -#define kfDirect		0x20
   34.21 -#define kfDirect555		0x40
   34.22 -#define kfDirect565		0x80
   34.23 +#define kfPalette                0x10
   34.24 +#define kfDirect                0x20
   34.25 +#define kfDirect555                0x40
   34.26 +#define kfDirect565                0x80
   34.27  
   34.28 -#define GX_FULLSCREEN		0x01
   34.29 +#define GX_FULLSCREEN                0x01
   34.30  
   34.31  enum ScreenOrientation { ORIENTATION_UNKNOWN = -1, ORIENTATION_UP = DMDO_0, ORIENTATION_DOWN = DMDO_180, ORIENTATION_LEFT = DMDO_270, ORIENTATION_RIGHT = DMDO_90 };
   34.32  enum ScreenGeometry { GEOMETRY_UNKNOWN, GEOMETRY_PORTRAIT, GEOMETRY_LANDSCAPE, GEOMETRY_SQUARE };
   34.33 @@ -123,15 +123,15 @@
   34.34  // private display data
   34.35  typedef struct
   34.36  {
   34.37 -    unsigned char* pixels;	// video memory
   34.38 -    int format;			// video format
   34.39 -    FrameBufferInfo fb;		// framebuffer geometry
   34.40 -    GapiInfo* gapi;		// GAPI module
   34.41 +    unsigned char* pixels;        // video memory
   34.42 +    int format;                        // video format
   34.43 +    FrameBufferInfo fb;                // framebuffer geometry
   34.44 +    GapiInfo* gapi;                // GAPI module
   34.45      int userOrientation;
   34.46      int systemOrientation;
   34.47      int hardwareGeometry;
   34.48 -    int flags;			// fb flags
   34.49 -    float scale;		// scale pointer position
   34.50 +    int flags;                        // fb flags
   34.51 +    float scale;                // scale pointer position
   34.52      int debug;
   34.53  
   34.54  } WINCE_RenderData;
   34.55 @@ -147,110 +147,111 @@
   34.56  
   34.57  
   34.58  // system func
   34.59 -SDL_Renderer*	WINCE_CreateRenderer(SDL_Window* window, Uint32 flags);
   34.60 -void		WINCE_DestroyRenderer(SDL_Renderer* renderer);
   34.61 +SDL_Renderer*        WINCE_CreateRenderer(SDL_Window* window, Uint32 flags);
   34.62 +void                WINCE_DestroyRenderer(SDL_Renderer* renderer);
   34.63  
   34.64 -int		WINCE_CreateTexture(SDL_Renderer* renderer, SDL_Texture* texture);
   34.65 -void		WINCE_DestroyTexture(SDL_Renderer* renderer, SDL_Texture* texture);
   34.66 -int		WINCE_QueryTexturePixels(SDL_Renderer* renderer, SDL_Texture* texture, void** pixels, int* pitch);
   34.67 -int		WINCE_UpdateTexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* rect, const void* pixels, int pitch);
   34.68 -int		WINCE_LockTexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* rect, int dirty, void** pixels, int* pitch);
   34.69 -void		WINCE_UnlockTexture(SDL_Renderer* renderer, SDL_Texture* texture);
   34.70 +int                WINCE_CreateTexture(SDL_Renderer* renderer, SDL_Texture* texture);
   34.71 +void                WINCE_DestroyTexture(SDL_Renderer* renderer, SDL_Texture* texture);
   34.72 +int                WINCE_QueryTexturePixels(SDL_Renderer* renderer, SDL_Texture* texture, void** pixels, int* pitch);
   34.73 +int                WINCE_UpdateTexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* rect, const void* pixels, int pitch);
   34.74 +int                WINCE_LockTexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* rect, int dirty, void** pixels, int* pitch);
   34.75 +void                WINCE_UnlockTexture(SDL_Renderer* renderer, SDL_Texture* texture);
   34.76  
   34.77 -int		WINCE_Available(void);
   34.78 -void		WINCE_SetupOrientation(WINCE_RenderData* data, int width, int height);
   34.79 +int                WINCE_Available(void);
   34.80 +void                WINCE_SetupOrientation(WINCE_RenderData* data, int width, int height);
   34.81  
   34.82 -int		WINCE_RenderCopy(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* srect, const SDL_Rect* drect);
   34.83 -void		WINCE_ShowWindow(_THIS, SDL_Window* window, int visible);
   34.84 +int                WINCE_RenderCopy(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* srect, const SDL_Rect* drect);
   34.85 +void                WINCE_ShowWindow(_THIS, SDL_Window* window, int visible);
   34.86  
   34.87 -void		WINCE_RenderPresent(SDL_Renderer* renderer);
   34.88 -int		WINCE_RenderDrawPoints(SDL_Renderer* renderer, const SDL_Point* points, int count);
   34.89 -int		WINCE_RenderDrawLines(SDL_Renderer* renderer, const SDL_Point* points, int count);
   34.90 -int		WINCE_RenderDrawRects(SDL_Renderer* renderer, const SDL_Rect ** rects, int count);
   34.91 -int		WINCE_RenderFillRects(SDL_Renderer* renderer, const SDL_Rect** rects, int count);
   34.92 +void                WINCE_RenderPresent(SDL_Renderer* renderer);
   34.93 +int                WINCE_RenderDrawPoints(SDL_Renderer* renderer, const SDL_Point* points, int count);
   34.94 +int                WINCE_RenderDrawLines(SDL_Renderer* renderer, const SDL_Point* points, int count);
   34.95 +int                WINCE_RenderDrawRects(SDL_Renderer* renderer, const SDL_Rect ** rects, int count);
   34.96 +int                WINCE_RenderFillRects(SDL_Renderer* renderer, const SDL_Rect** rects, int count);
   34.97  
   34.98 -void		WINCE_PointerCoordinateTransform(SDL_Window* window, POINT* pt);
   34.99 -void		WINCE_DumpVideoInfo(WINCE_RenderData* data);
  34.100 -void		WINCE_PortraitTransform(WINCE_RenderData* data, int width, int height);
  34.101 -void		WINCE_LandscapeTransform(WINCE_RenderData* data, int width, int height);
  34.102 -void		WINCE_SquareTransform(WINCE_RenderData* data, int width, int height);
  34.103 -int		WINCE_FixedGeometry(FrameBufferInfo* fb, int bpp, int debug);
  34.104 -int		WINCE_GetDMOrientation(void);
  34.105 -int		WINCE_SetDMOrientation(int orientation);
  34.106 -void		WINCE_UpdateYUVTextureData(SDL_Texture* texture);
  34.107 +void                WINCE_PointerCoordinateTransform(SDL_Window* window, POINT* pt);
  34.108 +void                WINCE_DumpVideoInfo(WINCE_RenderData* data);
  34.109 +void                WINCE_PortraitTransform(WINCE_RenderData* data, int width, int height);
  34.110 +void                WINCE_LandscapeTransform(WINCE_RenderData* data, int width, int height);
  34.111 +void                WINCE_SquareTransform(WINCE_RenderData* data, int width, int height);
  34.112 +int                WINCE_FixedGeometry(FrameBufferInfo* fb, int bpp, int debug);
  34.113 +int                WINCE_GetDMOrientation(void);
  34.114 +int                WINCE_SetDMOrientation(int orientation);
  34.115 +void                WINCE_UpdateYUVTextureData(SDL_Texture* texture);
  34.116  
  34.117  // gapi engine specific
  34.118 -int		GAPI_Init(WINCE_RenderData* data, HWND hwnd);
  34.119 -void		GAPI_Quit(WINCE_RenderData* data);
  34.120 +int                GAPI_Init(WINCE_RenderData* data, HWND hwnd);
  34.121 +void                GAPI_Quit(WINCE_RenderData* data);
  34.122  
  34.123  // raw engine specific
  34.124 -int		RAW_Init(WINCE_RenderData* data);
  34.125 -void		RAW_Quit(WINCE_RenderData* data);
  34.126 +int                RAW_Init(WINCE_RenderData* data);
  34.127 +void                RAW_Quit(WINCE_RenderData* data);
  34.128  
  34.129  // tools
  34.130 -void		FrameBufferRotate(FrameBufferInfo* src, int orientation);
  34.131 -int		GetFrameBufferOrientation(const FrameBufferInfo* src);
  34.132 -void		PointerRotate(POINT* pt, const FrameBufferInfo* fb, int orientation);
  34.133 -void		FrameBufferInitialize(FrameBufferInfo* fb);
  34.134 -void		FrameBufferDumpInfo(const FrameBufferInfo* fb, const char*);
  34.135 -const		char* GetOrientationName(int orientation);
  34.136 -void		UpdateLine16to16(const FrameBufferInfo* fb, const Uint16* src, Uint16* dst, Uint16 width);
  34.137 +void                FrameBufferRotate(FrameBufferInfo* src, int orientation);
  34.138 +int                GetFrameBufferOrientation(const FrameBufferInfo* src);
  34.139 +void                PointerRotate(POINT* pt, const FrameBufferInfo* fb, int orientation);
  34.140 +void                FrameBufferInitialize(FrameBufferInfo* fb);
  34.141 +void                FrameBufferDumpInfo(const FrameBufferInfo* fb, const char*);
  34.142 +const                char* GetOrientationName(int orientation);
  34.143 +void                UpdateLine16to16(const FrameBufferInfo* fb, const Uint16* src, Uint16* dst, Uint16 width);
  34.144  
  34.145  // stdlib
  34.146 -inline int	__abs(int x){ return x < 0 ? -x : x; };
  34.147 -inline void	__swap(int* a, int* b){ int t = *a; *a = *b; *b = t; };
  34.148 +static __inline__ int        __abs(int x){ return x < 0 ? -x : x; };
  34.149 +static __inline__ void        __swap(int* a, int* b){ int t = *a; *a = *b; *b = t; };
  34.150  
  34.151 -#define GAPI_RENDER_NAME	"gapi"
  34.152 -#define RAW_RENDER_NAME		"raw"
  34.153 +#define GAPI_RENDER_NAME        "gapi"
  34.154 +#define RAW_RENDER_NAME                "raw"
  34.155  //
  34.156  SDL_RenderDriver GAPI_RenderDriver = {
  34.157      WINCE_CreateRenderer,
  34.158      {
  34.159 -	GAPI_RENDER_NAME,
  34.160 -	(SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTDISCARD),
  34.161 -	(SDL_TEXTUREMODULATE_NONE),
  34.162 -	(SDL_BLENDMODE_NONE),
  34.163 -	(SDL_SCALEMODE_NONE),
  34.164 -	7,
  34.165 -	{
  34.166 -	    SDL_PIXELFORMAT_RGB555,
  34.167 -	    SDL_PIXELFORMAT_RGB565,
  34.168 -	    SDL_PIXELFORMAT_YV12,
  34.169 -	    SDL_PIXELFORMAT_IYUV,
  34.170 -	    SDL_PIXELFORMAT_YUY2,
  34.171 -	    SDL_PIXELFORMAT_UYVY,
  34.172 -	    SDL_PIXELFORMAT_YVYU
  34.173 -	},
  34.174 -	0,
  34.175 -	0
  34.176 +        GAPI_RENDER_NAME,
  34.177 +        (SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTDISCARD),
  34.178 +        (SDL_TEXTUREMODULATE_NONE),
  34.179 +        (SDL_BLENDMODE_NONE),
  34.180 +        (SDL_SCALEMODE_NONE),
  34.181 +        7,
  34.182 +        {
  34.183 +            SDL_PIXELFORMAT_RGB555,
  34.184 +            SDL_PIXELFORMAT_RGB565,
  34.185 +            SDL_PIXELFORMAT_YV12,
  34.186 +            SDL_PIXELFORMAT_IYUV,
  34.187 +            SDL_PIXELFORMAT_YUY2,
  34.188 +            SDL_PIXELFORMAT_UYVY,
  34.189 +            SDL_PIXELFORMAT_YVYU
  34.190 +        },
  34.191 +        0,
  34.192 +        0
  34.193      }
  34.194  };
  34.195  
  34.196  SDL_RenderDriver RAW_RenderDriver = {
  34.197      WINCE_CreateRenderer,
  34.198      {
  34.199 -	RAW_RENDER_NAME,
  34.200 -	(SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTDISCARD),
  34.201 -	(SDL_TEXTUREMODULATE_NONE),
  34.202 -	(SDL_BLENDMODE_NONE),
  34.203 -	(SDL_SCALEMODE_NONE),
  34.204 -	7,
  34.205 -	{
  34.206 -	    SDL_PIXELFORMAT_RGB555,
  34.207 -	    SDL_PIXELFORMAT_RGB565,
  34.208 -	    SDL_PIXELFORMAT_YV12,
  34.209 -	    SDL_PIXELFORMAT_IYUV,
  34.210 -	    SDL_PIXELFORMAT_YUY2,
  34.211 -	    SDL_PIXELFORMAT_UYVY,
  34.212 -	    SDL_PIXELFORMAT_YVYU
  34.213 -	},
  34.214 -	0,
  34.215 -	0
  34.216 +        RAW_RENDER_NAME,
  34.217 +        (SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTDISCARD),
  34.218 +        (SDL_TEXTUREMODULATE_NONE),
  34.219 +        (SDL_BLENDMODE_NONE),
  34.220 +        (SDL_SCALEMODE_NONE),
  34.221 +        7,
  34.222 +        {
  34.223 +            SDL_PIXELFORMAT_RGB555,
  34.224 +            SDL_PIXELFORMAT_RGB565,
  34.225 +            SDL_PIXELFORMAT_YV12,
  34.226 +            SDL_PIXELFORMAT_IYUV,
  34.227 +            SDL_PIXELFORMAT_YUY2,
  34.228 +            SDL_PIXELFORMAT_UYVY,
  34.229 +            SDL_PIXELFORMAT_YVYU
  34.230 +        },
  34.231 +        0,
  34.232 +        0
  34.233      }
  34.234  };
  34.235  
  34.236  int WINCE_Available(void)
  34.237  {
  34.238 +    HMODULE render_gapi;
  34.239      const char* preferably = SDL_getenv("SDL_VIDEO_RENDERER");
  34.240  
  34.241      // raw check
  34.242 @@ -260,13 +261,13 @@
  34.243      ReleaseDC(NULL, hdc);
  34.244  
  34.245      if(render_raw != 0 && rfbi.cxPixels != 0 && rfbi.cyPixels != 0 &&
  34.246 -        rfbi.pFramePointer != 0 && rfbi.cxStride != 0 && rfbi.cyStride != 0)
  34.247 -	    render_raw = 1;
  34.248 +       rfbi.pFramePointer != 0 && rfbi.cxStride != 0 && rfbi.cyStride != 0)
  34.249 +        render_raw = 1;
  34.250  
  34.251      if(preferably && 0 == SDL_strcasecmp(preferably, RAW_RENDER_NAME)) return 0 != render_raw;
  34.252  
  34.253      // gapi check
  34.254 -    HMODULE render_gapi = LoadLibrary(TEXT("\\Windows\\gx.dll"));
  34.255 +    render_gapi = LoadLibrary(TEXT("\\Windows\\gx.dll"));
  34.256      if(0 == render_gapi)
  34.257          render_gapi = LoadLibrary(TEXT("gx.dll"));
  34.258      FreeLibrary(render_gapi);
  34.259 @@ -290,8 +291,8 @@
  34.260      ReleaseDC(NULL, hdc);
  34.261  
  34.262      if(render_raw != 0 && rfbi.cxPixels != 0 && rfbi.cyPixels != 0 &&
  34.263 -    	rfbi.pFramePointer != 0 && rfbi.cxStride != 0 && rfbi.cyStride != 0)
  34.264 -	    render_raw = 1;
  34.265 +            rfbi.pFramePointer != 0 && rfbi.cxStride != 0 && rfbi.cyStride != 0)
  34.266 +            render_raw = 1;
  34.267  
  34.268      // gapi check
  34.269      render_gapi = LoadLibrary(TEXT("\\Windows\\gx.dll"));
  34.270 @@ -299,25 +300,25 @@
  34.271          render_gapi = LoadLibrary(TEXT("gx.dll"));
  34.272  
  34.273      if(render_gapi)
  34.274 -	FreeLibrary(render_gapi);
  34.275 +        FreeLibrary(render_gapi);
  34.276  
  34.277      for(ii = 0; ii < _this->num_displays; ++ii)
  34.278      {
  34.279 -	if(preferably)
  34.280 -	{
  34.281 -	    if(0 == SDL_strcasecmp(preferably, RAW_RENDER_NAME) && render_raw)
  34.282 -    		SDL_AddRenderDriver(&_this->displays[ii], &RAW_RenderDriver);
  34.283 -	    else
  34.284 -	    if(0 == SDL_strcasecmp(preferably, GAPI_RENDER_NAME) && render_gapi)
  34.285 -    		SDL_AddRenderDriver(&_this->displays[ii], &GAPI_RenderDriver);
  34.286 -	}
  34.287 -	else
  34.288 -	{
  34.289 -	    if(render_raw)
  34.290 -    		SDL_AddRenderDriver(&_this->displays[ii], &RAW_RenderDriver);
  34.291 -	    if(render_gapi)
  34.292 -    		SDL_AddRenderDriver(&_this->displays[ii], &GAPI_RenderDriver);
  34.293 -	}
  34.294 +        if(preferably)
  34.295 +        {
  34.296 +            if(0 == SDL_strcasecmp(preferably, RAW_RENDER_NAME) && render_raw)
  34.297 +                SDL_AddRenderDriver(&_this->displays[ii], &RAW_RenderDriver);
  34.298 +            else
  34.299 +            if(0 == SDL_strcasecmp(preferably, GAPI_RENDER_NAME) && render_gapi)
  34.300 +                SDL_AddRenderDriver(&_this->displays[ii], &GAPI_RenderDriver);
  34.301 +        }
  34.302 +        else
  34.303 +        {
  34.304 +            if(render_raw)
  34.305 +                SDL_AddRenderDriver(&_this->displays[ii], &RAW_RenderDriver);
  34.306 +            if(render_gapi)
  34.307 +                SDL_AddRenderDriver(&_this->displays[ii], &GAPI_RenderDriver);
  34.308 +        }
  34.309      }
  34.310  }
  34.311  
  34.312 @@ -332,7 +333,7 @@
  34.313      Uint32 Rmask, Gmask, Bmask, Amask;
  34.314  
  34.315      if(!(window->flags & SDL_WINDOW_FULLSCREEN))
  34.316 -	window->flags |= SDL_WINDOW_FULLSCREEN;
  34.317 +        window->flags |= SDL_WINDOW_FULLSCREEN;
  34.318  
  34.319      if(!SDL_PixelFormatEnumToMasks(displayMode->format, &bpp, &Rmask, &Gmask, &Bmask, &Amask))
  34.320      {
  34.321 @@ -342,13 +343,13 @@
  34.322  
  34.323      switch(window->fullscreen_mode.format)
  34.324      {
  34.325 -	case SDL_PIXELFORMAT_RGB555:
  34.326 -	case SDL_PIXELFORMAT_RGB565:
  34.327 -	    break;
  34.328 +        case SDL_PIXELFORMAT_RGB555:
  34.329 +        case SDL_PIXELFORMAT_RGB565:
  34.330 +            break;
  34.331  
  34.332 -	default:
  34.333 -    	    SDL_SetError("Support only 16 or 15 bpp");
  34.334 -	    return NULL;
  34.335 +        default:
  34.336 +            SDL_SetError("Support only 16 or 15 bpp");
  34.337 +            return NULL;
  34.338      }
  34.339  
  34.340      renderer = (SDL_Renderer*) SDL_calloc(1, sizeof(SDL_Renderer));
  34.341 @@ -375,9 +376,9 @@
  34.342  
  34.343  
  34.344      // set debug
  34.345 -    data->debug	= SDL_getenv("DEBUG_VIDEO_GAPI") || SDL_getenv("GAPI_RENDERER_DEBUG") ? 1 : 0;
  34.346 +    data->debug        = SDL_getenv("DEBUG_VIDEO_GAPI") || SDL_getenv("GAPI_RENDERER_DEBUG") ? 1 : 0;
  34.347  #if defined(DEBUG_VIDEO_GAPI) || defined(GAPI_RENDERER_DEBUG)
  34.348 -    data->debug	= 1;
  34.349 +    data->debug        = 1;
  34.350  #endif
  34.351  
  34.352      windowdata->videodata->render = data->gapi ? RENDER_GAPI : RENDER_RAW;
  34.353 @@ -418,10 +419,10 @@
  34.354  
  34.355      if(renderdata)
  34.356      {
  34.357 -	if(renderdata->gapi)
  34.358 -    	    GAPI_Quit(renderdata);
  34.359 -	else
  34.360 -	    RAW_Quit(renderdata);
  34.361 +        if(renderdata->gapi)
  34.362 +            GAPI_Quit(renderdata);
  34.363 +        else
  34.364 +            RAW_Quit(renderdata);
  34.365  
  34.366          SDL_free(renderdata);
  34.367      }
  34.368 @@ -448,20 +449,21 @@
  34.369  
  34.370      if(SDL_ISPIXELFORMAT_FOURCC(texture->format))
  34.371      {
  34.372 -	texturedata->yuv = SDL_SW_CreateYUVTexture(texture->format, texture->w, texture->h);
  34.373 +        SDL_Window* window = renderer->window;
  34.374 +        SDL_VideoDisplay* display = window->display;
  34.375 +
  34.376 +        texturedata->yuv = SDL_SW_CreateYUVTexture(texture->format, texture->w, texture->h);
  34.377          if(NULL == texturedata->yuv)
  34.378 -	{
  34.379 -    	    SDL_OutOfMemory();
  34.380 +        {
  34.381 +            SDL_OutOfMemory();
  34.382              return -1;
  34.383          }
  34.384 -	SDL_Window* window = renderer->window;
  34.385 -	SDL_VideoDisplay* display = window->display;
  34.386 -	texturedata->format = display->current_mode.format;
  34.387 +        texturedata->format = display->current_mode.format;
  34.388      }
  34.389      else
  34.390      {
  34.391 -	texturedata->yuv = NULL;
  34.392 -	texturedata->format = texture->format;
  34.393 +        texturedata->yuv = NULL;
  34.394 +        texturedata->format = texture->format;
  34.395      }
  34.396  
  34.397      texture->driverdata = texturedata;
  34.398 @@ -475,10 +477,10 @@
  34.399  
  34.400      if(texturedata)
  34.401      {
  34.402 -	if(texturedata->yuv) SDL_SW_DestroyYUVTexture(texturedata->yuv);
  34.403 -	if(texturedata->pixels) SDL_free(texturedata->pixels);
  34.404 -	SDL_free(texturedata);
  34.405 -	texture->driverdata = NULL;
  34.406 +        if(texturedata->yuv) SDL_SW_DestroyYUVTexture(texturedata->yuv);
  34.407 +        if(texturedata->pixels) SDL_free(texturedata->pixels);
  34.408 +        SDL_free(texturedata);
  34.409 +        texture->driverdata = NULL;
  34.410      }
  34.411  }
  34.412  
  34.413 @@ -509,19 +511,19 @@
  34.414  
  34.415      if(0 < rect->w && 0 < rect->h)
  34.416      {
  34.417 -	const unsigned char *src = ((const unsigned char*) pixels);
  34.418 -	unsigned char *dst = ((unsigned char*) texturedata->pixels) +
  34.419 -				rect->y * texturedata->pitch +
  34.420 -				rect->x * SDL_BYTESPERPIXEL(texture->format);
  34.421 +        const unsigned char *src = ((const unsigned char*) pixels);
  34.422 +        unsigned char *dst = ((unsigned char*) texturedata->pixels) +
  34.423 +                                rect->y * texturedata->pitch +
  34.424 +                                rect->x * SDL_BYTESPERPIXEL(texture->format);
  34.425          int length = rect->w * SDL_BYTESPERPIXEL(texture->format);
  34.426 -	int height = rect->h;
  34.427 +        int height = rect->h;
  34.428  
  34.429 -	while(height--)
  34.430 -	{
  34.431 -	    SDL_memcpy(dst, src, length);
  34.432 -	    dst += texturedata->pitch;
  34.433 -	    src += pitch;
  34.434 -	}
  34.435 +        while(height--)
  34.436 +        {
  34.437 +            SDL_memcpy(dst, src, length);
  34.438 +            dst += texturedata->pitch;
  34.439 +            src += pitch;
  34.440 +        }
  34.441      }
  34.442  
  34.443      return 0;
  34.444 @@ -535,9 +537,10 @@
  34.445          return SDL_SW_LockYUVTexture(texturedata->yuv, rect, dirty, pixels, pitch);
  34.446  
  34.447      *pixels = (void *) ((unsigned char*) texturedata->pixels +
  34.448 -		    rect->y * texturedata->pitch +
  34.449 -		    rect->x * SDL_BYTESPERPIXEL(texture->format));
  34.450 +                    rect->y * texturedata->pitch +
  34.451 +                    rect->x * SDL_BYTESPERPIXEL(texture->format));
  34.452      *pitch = texturedata->pitch;
  34.453 +    return 0;
  34.454  }
  34.455  
  34.456  void WINCE_UnlockTexture(SDL_Renderer* renderer, SDL_Texture* texture)
  34.457 @@ -547,7 +550,7 @@
  34.458      if(texturedata->yuv)
  34.459      {
  34.460          SDL_SW_UnlockYUVTexture(texturedata->yuv);
  34.461 -	WINCE_UpdateYUVTextureData(texture);
  34.462 +        WINCE_UpdateYUVTextureData(texture);
  34.463      }
  34.464  }
  34.465  
  34.466 @@ -555,41 +558,43 @@
  34.467  {
  34.468      WINCE_RenderData* dstdata = (WINCE_RenderData*) renderer->driverdata;
  34.469      WINCE_TextureData* srcdata = (WINCE_TextureData*) texture->driverdata;
  34.470 +    const unsigned char *src;
  34.471 +    unsigned char *dst;
  34.472  
  34.473      if((dstdata->flags & FB_SUSPENDED) ||
  34.474 -       0 >= srect->w || 0 >= srect->h) return;
  34.475 +       0 >= srect->w || 0 >= srect->h) return 0;
  34.476  
  34.477      // lock gapi
  34.478      if(dstdata->gapi) dstdata->gapi->GXBeginDraw();
  34.479  
  34.480 -    const unsigned char *src = ((const unsigned char*) srcdata->pixels);
  34.481 -    unsigned char *dst = dstdata->pixels + (dstdata->flags & FB_SKIP_OFFSET ? 0 : dstdata->fb.offset) +
  34.482 -				drect->y * dstdata->fb.ypitch +
  34.483 -				drect->x * dstdata->fb.xpitch;
  34.484 +    src = ((const unsigned char*) srcdata->pixels);
  34.485 +    dst = dstdata->pixels + (dstdata->flags & FB_SKIP_OFFSET ? 0 : dstdata->fb.offset) +
  34.486 +                                drect->y * dstdata->fb.ypitch +
  34.487 +                                drect->x * dstdata->fb.xpitch;
  34.488      if(srcdata->yuv)
  34.489      {
  34.490 -	return SDL_SW_CopyYUVToRGB(srcdata->yuv,
  34.491 +        return SDL_SW_CopyYUVToRGB(srcdata->yuv,
  34.492                                     srect, srcdata->format,
  34.493                                     drect->w, drect->h, dst,
  34.494                                     dstdata->fb.ypitch);
  34.495      }
  34.496      else
  34.497      {
  34.498 -	int height = drect->h;
  34.499 -	int length = drect->w * SDL_BYTESPERPIXEL(texture->format); // in bytes
  34.500 +        int height = drect->h;
  34.501 +        int length = drect->w * SDL_BYTESPERPIXEL(texture->format); // in bytes
  34.502  
  34.503 -	while(height--)
  34.504 -	{
  34.505 -	    switch(SDL_BYTESPERPIXEL(texture->format))
  34.506 -	    {
  34.507 -		case 2: UpdateLine16to16(&dstdata->fb, (Uint16*) src, (Uint16*) dst, length >> 1); break;
  34.508 +        while(height--)
  34.509 +        {
  34.510 +            switch(SDL_BYTESPERPIXEL(texture->format))
  34.511 +            {
  34.512 +                case 2: UpdateLine16to16(&dstdata->fb, (Uint16*) src, (Uint16*) dst, length >> 1); break;
  34.513  
  34.514 -		default: break;
  34.515 -	    }
  34.516 +                default: break;
  34.517 +            }
  34.518  
  34.519 -	    dst += dstdata->fb.ypitch;
  34.520 -	    src += srcdata->pitch;
  34.521 -	}
  34.522 +            dst += dstdata->fb.ypitch;
  34.523 +            src += srcdata->pitch;
  34.524 +        }
  34.525      }
  34.526  
  34.527      // unlock gapi
  34.528 @@ -630,8 +635,8 @@
  34.529  
  34.530  void WINCE_SetupOrientation(WINCE_RenderData* data, int width, int height)
  34.531  {
  34.532 -    const float maxW1 = GetSystemMetrics(SM_CXSCREEN) > GetSystemMetrics(SM_CYSCREEN) ? GetSystemMetrics(SM_CXSCREEN) : GetSystemMetrics(SM_CYSCREEN);
  34.533 -    const float maxW2 = data->fb.width > data->fb.height ? data->fb.width : data->fb.height;
  34.534 +    const float maxW1 = (float)(GetSystemMetrics(SM_CXSCREEN) > GetSystemMetrics(SM_CYSCREEN) ? GetSystemMetrics(SM_CXSCREEN) : GetSystemMetrics(SM_CYSCREEN));
  34.535 +    const float maxW2 = (float)(data->fb.width > data->fb.height ? data->fb.width : data->fb.height);
  34.536  
  34.537      // scale define
  34.538      data->scale = maxW2 / maxW1;
  34.539 @@ -643,31 +648,31 @@
  34.540      data->userOrientation = ORIENTATION_UP;
  34.541      data->systemOrientation = WINCE_GetDMOrientation();
  34.542      data->hardwareGeometry = data->fb.width == data->fb.height ? GEOMETRY_SQUARE :
  34.543 -				(data->fb.width < data->fb.height ? GEOMETRY_PORTRAIT : GEOMETRY_LANDSCAPE);
  34.544 +                                (data->fb.width < data->fb.height ? GEOMETRY_PORTRAIT : GEOMETRY_LANDSCAPE);
  34.545  
  34.546      if(data->debug)
  34.547 -	WINCE_DumpVideoInfo(data);
  34.548 +        WINCE_DumpVideoInfo(data);
  34.549  
  34.550      if(data->systemOrientation == ORIENTATION_UNKNOWN)
  34.551 -	data->systemOrientation == ORIENTATION_UP;
  34.552 +        data->systemOrientation = ORIENTATION_UP;
  34.553  
  34.554      data->userOrientation = ORIENTATION_UP;
  34.555  
  34.556      switch(data->hardwareGeometry)
  34.557      {
  34.558 -	case GEOMETRY_PORTRAIT:  WINCE_PortraitTransform(data, width, height); break;
  34.559 -	case GEOMETRY_LANDSCAPE: WINCE_LandscapeTransform(data, width, height); break;
  34.560 -	case GEOMETRY_SQUARE:    WINCE_SquareTransform(data, width, height); break;
  34.561 -	default: break;
  34.562 +        case GEOMETRY_PORTRAIT:  WINCE_PortraitTransform(data, width, height); break;
  34.563 +        case GEOMETRY_LANDSCAPE: WINCE_LandscapeTransform(data, width, height); break;
  34.564 +        case GEOMETRY_SQUARE:    WINCE_SquareTransform(data, width, height); break;
  34.565 +        default: break;
  34.566      }
  34.567  
  34.568      // debug
  34.569      if(data->debug)
  34.570      {
  34.571 -	printf("\n");
  34.572 -	printf("user video width:          %d\n", width);
  34.573 -	printf("user video height:         %d\n", height);
  34.574 -	FrameBufferDumpInfo(&data->fb, "user");
  34.575 +        printf("\n");
  34.576 +        printf("user video width:          %d\n", width);
  34.577 +        printf("user video height:         %d\n", height);
  34.578 +        FrameBufferDumpInfo(&data->fb, "user");
  34.579      }
  34.580  }
  34.581  
  34.582 @@ -705,42 +710,42 @@
  34.583  
  34.584      if(visible)
  34.585      {
  34.586 -	if(window->flags & SDL_WINDOW_FULLSCREEN)
  34.587 -	{
  34.588 -	    if(videodata->SHFullScreen)
  34.589 -		videodata->SHFullScreen(windowdata->hwnd, SHFS_HIDETASKBAR | SHFS_HIDESTARTICON | SHFS_HIDESIPBUTTON);
  34.590 -	    ShowWindow(FindWindow(TEXT("HHTaskBar"), NULL), SW_HIDE);
  34.591 -	}
  34.592 +        if(window->flags & SDL_WINDOW_FULLSCREEN)
  34.593 +        {
  34.594 +            if(videodata->SHFullScreen)
  34.595 +                videodata->SHFullScreen(windowdata->hwnd, SHFS_HIDETASKBAR | SHFS_HIDESTARTICON | SHFS_HIDESIPBUTTON);
  34.596 +            ShowWindow(FindWindow(TEXT("HHTaskBar"), NULL), SW_HIDE);
  34.597 +        }
  34.598  
  34.599 -	ShowWindow(windowdata->hwnd, SW_SHOW);
  34.600 +        ShowWindow(windowdata->hwnd, SW_SHOW);
  34.601          SetForegroundWindow(windowdata->hwnd);
  34.602  
  34.603 -	if(renderer &&
  34.604 -	    (videodata->render == RENDER_GAPI || videodata->render == RENDER_RAW))
  34.605 -	{
  34.606 -	    WINCE_RenderData* renderdata = (WINCE_RenderData*) renderer->driverdata;
  34.607 -	    renderdata->flags &= ~FB_SUSPENDED;
  34.608 -	    if(renderdata->gapi) renderdata->gapi->GXResume();
  34.609 -	}
  34.610 +        if(renderer &&
  34.611 +            (videodata->render == RENDER_GAPI || videodata->render == RENDER_RAW))
  34.612 +        {
  34.613 +            WINCE_RenderData* renderdata = (WINCE_RenderData*) renderer->driverdata;
  34.614 +            renderdata->flags &= ~FB_SUSPENDED;
  34.615 +            if(renderdata->gapi) renderdata->gapi->GXResume();
  34.616 +        }
  34.617      }
  34.618      else
  34.619      {
  34.620 -	if(renderer &&
  34.621 -	    (videodata->render == RENDER_GAPI || videodata->render == RENDER_RAW))
  34.622 -	{
  34.623 -	    WINCE_RenderData* renderdata = (WINCE_RenderData*) renderer->driverdata;
  34.624 -	    if(renderdata->gapi) renderdata->gapi->GXSuspend();
  34.625 -	    renderdata->flags |= FB_SUSPENDED;
  34.626 -	}
  34.627 +        if(renderer &&
  34.628 +            (videodata->render == RENDER_GAPI || videodata->render == RENDER_RAW))
  34.629 +        {
  34.630 +            WINCE_RenderData* renderdata = (WINCE_RenderData*) renderer->driverdata;
  34.631 +            if(renderdata->gapi) renderdata->gapi->GXSuspend();
  34.632 +            renderdata->flags |= FB_SUSPENDED;
  34.633 +        }
  34.634  
  34.635 -	ShowWindow(windowdata->hwnd, SW_HIDE);
  34.636 +        ShowWindow(windowdata->hwnd, SW_HIDE);
  34.637  
  34.638 -	if(window->flags & SDL_WINDOW_FULLSCREEN)
  34.639 -	{
  34.640 -	    if(videodata->SHFullScreen)
  34.641 -		videodata->SHFullScreen(windowdata->hwnd, SHFS_SHOWTASKBAR | SHFS_SHOWSTARTICON | SHFS_SHOWSIPBUTTON);
  34.642 -	    ShowWindow(FindWindow(TEXT("HHTaskBar"), NULL), SW_SHOW);
  34.643 -	}
  34.644 +        if(window->flags & SDL_WINDOW_FULLSCREEN)
  34.645 +        {
  34.646 +            if(videodata->SHFullScreen)
  34.647 +                videodata->SHFullScreen(windowdata->hwnd, SHFS_SHOWTASKBAR | SHFS_SHOWSTARTICON | SHFS_SHOWSIPBUTTON);
  34.648 +            ShowWindow(FindWindow(TEXT("HHTaskBar"), NULL), SW_SHOW);
  34.649 +        }
  34.650      }
  34.651  }
  34.652  
  34.653 @@ -749,8 +754,8 @@
  34.654  {
  34.655      WINCE_RenderData* data = (WINCE_RenderData*) window->renderer->driverdata;
  34.656  
  34.657 -    pt->x *= data->scale;
  34.658 -    pt->y *= data->scale;
  34.659 +    pt->x = (LONG)(pt->x * data->scale);
  34.660 +    pt->y = (LONG)(pt->y * data->scale);
  34.661  
  34.662      PointerRotate(pt, &data->fb, data->userOrientation);
  34.663  }
  34.664 @@ -758,44 +763,45 @@
  34.665  void WINCE_PortraitTransform(WINCE_RenderData* data, int width, int height)
  34.666  {
  34.667      if(data->systemOrientation != ORIENTATION_UP)
  34.668 -	FrameBufferRotate(&data->fb, data->systemOrientation);
  34.669 +        FrameBufferRotate(&data->fb, data->systemOrientation);
  34.670  
  34.671 -    if(data->fb.width != width || data->fb.height != height)
  34.672 -    switch(data->systemOrientation)
  34.673 -    {
  34.674 -	case ORIENTATION_UP:
  34.675 -	case ORIENTATION_LEFT: data->userOrientation = ORIENTATION_RIGHT; break;
  34.676 -	case ORIENTATION_RIGHT:
  34.677 -	case ORIENTATION_DOWN: data->userOrientation = ORIENTATION_LEFT; break;
  34.678 -	default: break;
  34.679 +    if(data->fb.width != width || data->fb.height != height) {
  34.680 +        switch(data->systemOrientation)
  34.681 +        {
  34.682 +            case ORIENTATION_UP:
  34.683 +            case ORIENTATION_LEFT: data->userOrientation = ORIENTATION_RIGHT; break;
  34.684 +            case ORIENTATION_RIGHT:
  34.685 +            case ORIENTATION_DOWN: data->userOrientation = ORIENTATION_LEFT; break;
  34.686 +            default: break;
  34.687 +        }
  34.688      }
  34.689  
  34.690      if(data->userOrientation != ORIENTATION_UP)
  34.691 -	FrameBufferRotate(&data->fb, data->userOrientation);
  34.692 +        FrameBufferRotate(&data->fb, data->userOrientation);
  34.693  }
  34.694  
  34.695  void WINCE_LandscapeTransform(WINCE_RenderData* data, int width, int height)
  34.696  {
  34.697      switch(data->systemOrientation)
  34.698      {
  34.699 -	case ORIENTATION_UP:  FrameBufferRotate(&data->fb, ORIENTATION_LEFT); break;
  34.700 -	case ORIENTATION_LEFT:FrameBufferRotate(&data->fb, ORIENTATION_DOWN); break;
  34.701 -	case ORIENTATION_DOWN:FrameBufferRotate(&data->fb, ORIENTATION_RIGHT); break;
  34.702 -	default: break;
  34.703 +        case ORIENTATION_UP:  FrameBufferRotate(&data->fb, ORIENTATION_LEFT); break;
  34.704 +        case ORIENTATION_LEFT:FrameBufferRotate(&data->fb, ORIENTATION_DOWN); break;
  34.705 +        case ORIENTATION_DOWN:FrameBufferRotate(&data->fb, ORIENTATION_RIGHT); break;
  34.706 +        default: break;
  34.707      }
  34.708  
  34.709      if(data->fb.width != width || data->fb.height != height)
  34.710      switch(data->systemOrientation)
  34.711      {
  34.712 -	case ORIENTATION_UP:
  34.713 -	case ORIENTATION_LEFT: data->userOrientation = ORIENTATION_RIGHT; break;
  34.714 -	case ORIENTATION_RIGHT:
  34.715 -	case ORIENTATION_DOWN: data->userOrientation = ORIENTATION_LEFT; break;
  34.716 -	default: break;
  34.717 +        case ORIENTATION_UP:
  34.718 +        case ORIENTATION_LEFT: data->userOrientation = ORIENTATION_RIGHT; break;
  34.719 +        case ORIENTATION_RIGHT:
  34.720 +        case ORIENTATION_DOWN: data->userOrientation = ORIENTATION_LEFT; break;
  34.721 +        default: break;
  34.722      }
  34.723  
  34.724      if(data->userOrientation != ORIENTATION_UP)
  34.725 -	FrameBufferRotate(&data->fb, data->userOrientation);
  34.726 +        FrameBufferRotate(&data->fb, data->userOrientation);
  34.727  }
  34.728  
  34.729  void WINCE_SquareTransform(WINCE_RenderData* data, int width, int height)
  34.730 @@ -807,43 +813,43 @@
  34.731  {
  34.732      // check square
  34.733      if(GetSystemMetrics(SM_CXSCREEN) == GetSystemMetrics(SM_CYSCREEN) &&
  34.734 -	fb->width != fb->height)
  34.735 +        fb->width != fb->height)
  34.736      {
  34.737 -	if(fb->width < fb->height)
  34.738 -	    fb->height = fb->width;
  34.739 -	else
  34.740 -	if(fb->height < fb->width)
  34.741 -	    fb->width = fb->height;
  34.742 +        if(fb->width < fb->height)
  34.743 +            fb->height = fb->width;
  34.744 +        else
  34.745 +        if(fb->height < fb->width)
  34.746 +            fb->width = fb->height;
  34.747      }
  34.748  
  34.749      // check width
  34.750      if(__abs(fb->xpitch) == bpp &&
  34.751 -	fb->width  != __abs(fb->ypitch) / bpp)
  34.752 +        fb->width  != __abs(fb->ypitch) / bpp)
  34.753      {
  34.754 -	if(fb->height == __abs(fb->ypitch) / bpp)
  34.755 -    	{
  34.756 -	    __swap(&fb->width, &fb->height);
  34.757 +        if(fb->height == __abs(fb->ypitch) / bpp)
  34.758 +            {
  34.759 +            __swap(&fb->width, &fb->height);
  34.760  
  34.761 -	    if(debug)
  34.762 -		printf("WINCE_FixedGeometry: width: %d, height: %d\n", fb->width, fb->height);
  34.763 -	}
  34.764 -	else
  34.765 -	    return -1;
  34.766 +            if(debug)
  34.767 +                printf("WINCE_FixedGeometry: width: %d, height: %d\n", fb->width, fb->height);
  34.768 +        }
  34.769 +        else
  34.770 +            return -1;
  34.771      }
  34.772      else
  34.773      // check height
  34.774      if(__abs(fb->ypitch) == bpp &&
  34.775 -	fb->height != __abs(fb->xpitch) / bpp)
  34.776 +        fb->height != __abs(fb->xpitch) / bpp)
  34.777      {
  34.778 -	if(fb->width  == __abs(fb->xpitch) / bpp)
  34.779 -    	{
  34.780 -	    __swap(&fb->width, &fb->height);
  34.781 +        if(fb->width  == __abs(fb->xpitch) / bpp)
  34.782 +            {
  34.783 +            __swap(&fb->width, &fb->height);
  34.784  
  34.785 -	    if(debug)
  34.786 -		printf("WINCE_FixedGeometry: width: %d, height: %d\n", fb->width, fb->height);
  34.787 -	}
  34.788 -	else
  34.789 -	    return -1;
  34.790 +            if(debug)
  34.791 +                printf("WINCE_FixedGeometry: width: %d, height: %d\n", fb->width, fb->height);
  34.792 +        }
  34.793 +        else
  34.794 +            return -1;
  34.795      }
  34.796  
  34.797      return 0;
  34.798 @@ -865,8 +871,12 @@
  34.799  {
  34.800      if(NULL == data->gapi)
  34.801      {
  34.802 -	const char* preferably = SDL_getenv("SDL_VIDEO_RENDERER");
  34.803 -	if(preferably && 0 != SDL_strcasecmp(preferably, GAPI_RENDER_NAME)) return 0;
  34.804 +        struct GXDisplayProperties gxProperties;
  34.805 +        GXDeviceInfo gxInfo = { 0 };
  34.806 +        HDC hdc;
  34.807 +        int enable, result;
  34.808 +        const char* preferably = SDL_getenv("SDL_VIDEO_RENDERER");
  34.809 +        if(preferably && 0 != SDL_strcasecmp(preferably, GAPI_RENDER_NAME)) return 0;
  34.810  
  34.811          data->gapi = (GapiInfo *) SDL_calloc(1, sizeof(GapiInfo));
  34.812          if(NULL == data->gapi)
  34.813 @@ -875,116 +885,116 @@
  34.814              return 0;
  34.815          }
  34.816  
  34.817 -	data->gapi->hGapiLib = LoadLibrary(TEXT("\\Windows\\gx.dll"));
  34.818 -	if(0 == data->gapi->hGapiLib)
  34.819 -	{
  34.820 -	    data->gapi->hGapiLib = LoadLibrary(TEXT("gx.dll"));
  34.821 -	    if(0 == data->gapi->hGapiLib) return 0;
  34.822 -	}
  34.823 +        data->gapi->hGapiLib = LoadLibrary(TEXT("\\Windows\\gx.dll"));
  34.824 +        if(0 == data->gapi->hGapiLib)
  34.825 +        {
  34.826 +            data->gapi->hGapiLib = LoadLibrary(TEXT("gx.dll"));
  34.827 +            if(0 == data->gapi->hGapiLib) return 0;
  34.828 +        }
  34.829  
  34.830 -	// load gapi library
  34.831 +        // load gapi library
  34.832  #define LINK(type,name,import) name=(PFN##type)GetProcAddress(data->gapi->hGapiLib,TEXT(import))
  34.833 -	LINK(GXOpenDisplay,         data->gapi->GXOpenDisplay,         "?GXOpenDisplay@@YAHPAUHWND__@@K@Z");
  34.834 -	LINK(GXCloseDisplay,        data->gapi->GXCloseDisplay,        "?GXCloseDisplay@@YAHXZ");
  34.835 -	LINK(GXBeginDraw,           data->gapi->GXBeginDraw,           "?GXBeginDraw@@YAPAXXZ");
  34.836 -	LINK(GXEndDraw,             data->gapi->GXEndDraw,             "?GXEndDraw@@YAHXZ");
  34.837 -	LINK(GXGetDisplayProperties,data->gapi->GXGetDisplayProperties,"?GXGetDisplayProperties@@YA?AUGXDisplayProperties@@XZ");
  34.838 -	LINK(GXSuspend,             data->gapi->GXSuspend,             "?GXSuspend@@YAHXZ");
  34.839 -	LINK(GXResume,              data->gapi->GXResume,              "?GXResume@@YAHXZ");
  34.840 +        LINK(GXOpenDisplay,         data->gapi->GXOpenDisplay,         "?GXOpenDisplay@@YAHPAUHWND__@@K@Z");
  34.841 +        LINK(GXCloseDisplay,        data->gapi->GXCloseDisplay,        "?GXCloseDisplay@@YAHXZ");
  34.842 +        LINK(GXBeginDraw,           data->gapi->GXBeginDraw,           "?GXBeginDraw@@YAPAXXZ");
  34.843 +        LINK(GXEndDraw,             data->gapi->GXEndDraw,             "?GXEndDraw@@YAHXZ");
  34.844 +        LINK(GXGetDisplayProperties,data->gapi->GXGetDisplayProperties,"?GXGetDisplayProperties@@YA?AUGXDisplayProperties@@XZ");
  34.845 +        LINK(GXSuspend,             data->gapi->GXSuspend,             "?GXSuspend@@YAHXZ");
  34.846 +        LINK(GXResume,              data->gapi->GXResume,              "?GXResume@@YAHXZ");
  34.847  #undef LINK
  34.848  
  34.849 -	int enable = data->gapi->GXGetDisplayProperties && data->gapi->GXCloseDisplay && data->gapi->GXOpenDisplay &&
  34.850 -	    data->gapi->GXBeginDraw && data->gapi->GXEndDraw && data->gapi->GXSuspend && data->gapi->GXResume;
  34.851 +        enable = data->gapi->GXGetDisplayProperties && data->gapi->GXCloseDisplay && data->gapi->GXOpenDisplay &&
  34.852 +            data->gapi->GXBeginDraw && data->gapi->GXEndDraw && data->gapi->GXSuspend && data->gapi->GXResume;
  34.853  
  34.854 -	if(!enable)
  34.855 -	{
  34.856 -	    SDL_SetError("GAPI_Init: error gx.dll: internal error");
  34.857 -	    GAPI_Quit(data);
  34.858 -	    return 0;
  34.859 -	}
  34.860 +        if(!enable)
  34.861 +        {
  34.862 +            SDL_SetError("GAPI_Init: error gx.dll: internal error");
  34.863 +            GAPI_Quit(data);
  34.864 +            return 0;
  34.865 +        }
  34.866  
  34.867 -	if(0 == data->gapi->GXOpenDisplay(hwnd, GX_FULLSCREEN))
  34.868 -	{
  34.869 -	    SDL_SetError("GAPI_Init: couldn't initialize GAPI");
  34.870 -	    GAPI_Quit(data);
  34.871 -	    return 0;
  34.872 -	}
  34.873 +        if(0 == data->gapi->GXOpenDisplay(hwnd, GX_FULLSCREEN))
  34.874 +        {
  34.875 +            SDL_SetError("GAPI_Init: couldn't initialize GAPI");
  34.876 +            GAPI_Quit(data);
  34.877 +            return 0;
  34.878 +        }
  34.879  
  34.880 -	struct GXDisplayProperties gxProperties = data->gapi->GXGetDisplayProperties();
  34.881 +        gxProperties = data->gapi->GXGetDisplayProperties();
  34.882  
  34.883 -	// fill FrameBufferInfo
  34.884 -	data->fb.xpitch = gxProperties.cbxPitch;
  34.885 -	data->fb.ypitch = gxProperties.cbyPitch;
  34.886 -	data->fb.width  = gxProperties.cxWidth;
  34.887 -	data->fb.height = gxProperties.cyHeight;
  34.888 -	data->fb.offset = 0;
  34.889 +        // fill FrameBufferInfo
  34.890 +        data->fb.xpitch = gxProperties.cbxPitch;
  34.891 +        data->fb.ypitch = gxProperties.cbyPitch;
  34.892 +        data->fb.width  = gxProperties.cxWidth;
  34.893 +        data->fb.height = gxProperties.cyHeight;
  34.894 +        data->fb.offset = 0;
  34.895  
  34.896          if((gxProperties.ffFormat & kfDirect565) || 16 == gxProperties.cBPP)
  34.897 -	    data->format = SDL_PIXELFORMAT_RGB565;
  34.898 -	else
  34.899 -	if((gxProperties.ffFormat & kfDirect555) || 15 == gxProperties.cBPP)
  34.900 -	    data->format = SDL_PIXELFORMAT_RGB555;
  34.901 -	else
  34.902 -	    data->format = 0;
  34.903 +            data->format = SDL_PIXELFORMAT_RGB565;
  34.904 +        else
  34.905 +        if((gxProperties.ffFormat & kfDirect555) || 15 == gxProperties.cBPP)
  34.906 +            data->format = SDL_PIXELFORMAT_RGB555;
  34.907 +        else
  34.908 +            data->format = 0;
  34.909  
  34.910 -	// get pixels
  34.911 -	GXDeviceInfo gxInfo = { 0 };
  34.912 -	HDC hdc = GetDC(NULL);
  34.913 +        // get pixels
  34.914 +        hdc = GetDC(NULL);
  34.915  
  34.916 -	gxInfo.Version = 100;
  34.917 -	int result = ExtEscape(hdc, GETGXINFO, 0, NULL, sizeof(gxInfo), (char *) &gxInfo);
  34.918 -	ReleaseDC(NULL, hdc);
  34.919 +        gxInfo.Version = 100;
  34.920 +        result = ExtEscape(hdc, GETGXINFO, 0, NULL, sizeof(gxInfo), (char *) &gxInfo);
  34.921 +        ReleaseDC(NULL, hdc);
  34.922  
  34.923 -	if(result > 0)
  34.924 -	{
  34.925 -	    // more debug
  34.926 -	    if(data->debug)
  34.927 -	    {
  34.928 -		printf("GXDeviceInfo.pvFrameBuffer:    %p\n", gxInfo.pvFrameBuffer);
  34.929 -    		printf("GXDeviceInfo.cxWidth:          %d\n", gxInfo.cxWidth);
  34.930 -    		printf("GXDeviceInfo.cyHeight:         %d\n", gxInfo.cyHeight);
  34.931 -    		printf("GXDeviceInfo.cbStride:         %d\n", gxInfo.cbStride);
  34.932 -    		printf("GXDeviceInfo.cBPP:             %d\n", gxInfo.cBPP);
  34.933 -    		printf("GXDeviceInfo.ffFormat:        0x%x\n", gxInfo.ffFormat);
  34.934 +        if(result > 0)
  34.935 +        {
  34.936 +            // more debug
  34.937 +            if(data->debug)
  34.938 +            {
  34.939 +                int i;
  34.940  
  34.941 -    		printf("GXDeviceInfo.unk:\n");
  34.942 -		int ii; for(ii = 0; ii <  sizeof(gxInfo.unknown); ++ii)
  34.943 -		printf("0x%02hhX,", gxInfo.unknown[ii]);
  34.944 -		printf("\n");
  34.945 -	    }
  34.946 +                printf("GXDeviceInfo.pvFrameBuffer:    %p\n", gxInfo.pvFrameBuffer);
  34.947 +                printf("GXDeviceInfo.cxWidth:          %d\n", gxInfo.cxWidth);
  34.948 +                printf("GXDeviceInfo.cyHeight:         %d\n", gxInfo.cyHeight);
  34.949 +                printf("GXDeviceInfo.cbStride:         %d\n", gxInfo.cbStride);
  34.950 +                printf("GXDeviceInfo.cBPP:             %d\n", gxInfo.cBPP);
  34.951 +                printf("GXDeviceInfo.ffFormat:        0x%x\n", gxInfo.ffFormat);
  34.952  
  34.953 -    	    if(gxInfo.ffFormat && gxInfo.ffFormat != gxProperties.ffFormat)
  34.954 -	    {
  34.955 -		if((gxInfo.ffFormat & kfDirect565) || 16 == gxInfo.cBPP)
  34.956 -		    data->format = SDL_PIXELFORMAT_RGB565;
  34.957 -		else
  34.958 -		if((gxInfo.ffFormat & kfDirect555) || 15 == gxInfo.cBPP)
  34.959 -		    data->format = SDL_PIXELFORMAT_RGB555;
  34.960 -	    }
  34.961 +                printf("GXDeviceInfo.unk:\n");
  34.962 +                for(i = 0; i <  sizeof(gxInfo.unknown); ++i)
  34.963 +                    printf("0x%02hhX,", gxInfo.unknown[i]);
  34.964 +                printf("\n");
  34.965 +            }
  34.966  
  34.967 -    	    data->pixels = gxInfo.pvFrameBuffer;
  34.968 +                if(gxInfo.ffFormat && gxInfo.ffFormat != gxProperties.ffFormat) {
  34.969 +                    if((gxInfo.ffFormat & kfDirect565) || 16 == gxInfo.cBPP)
  34.970 +                        data->format = SDL_PIXELFORMAT_RGB565;
  34.971 +                    else
  34.972 +                    if((gxInfo.ffFormat & kfDirect555) || 15 == gxInfo.cBPP)
  34.973 +                        data->format = SDL_PIXELFORMAT_RGB555;
  34.974 +                }
  34.975 +
  34.976 +                data->pixels = gxInfo.pvFrameBuffer;
  34.977          }
  34.978 -	else
  34.979 -	{
  34.980 -	    data->flags |= FB_SKIP_OFFSET;
  34.981 -	    data->pixels = data->gapi->GXBeginDraw();
  34.982 -	    data->gapi->GXEndDraw();
  34.983 +        else
  34.984 +        {
  34.985 +            data->flags |= FB_SKIP_OFFSET;
  34.986 +            data->pixels = data->gapi->GXBeginDraw();
  34.987 +            data->gapi->GXEndDraw();
  34.988  
  34.989 -	    if(data->debug)
  34.990 -	    {
  34.991 -		printf("GAPI_Init\n");
  34.992 -		printf("use GXBeginDraw:               %p\n", data->pixels);
  34.993 -		printf("use skip offset\n");
  34.994 -	    }
  34.995 -	}
  34.996 +            if(data->debug)
  34.997 +            {
  34.998 +                printf("GAPI_Init\n");
  34.999 +                printf("use GXBeginDraw:               %p\n", data->pixels);
 34.1000 +                printf("use skip offset\n");
 34.1001 +            }
 34.1002 +        }
 34.1003  
 34.1004 -	if(0 == data->format ||
 34.1005 -	    0 > WINCE_FixedGeometry(&data->fb, SDL_BYTESPERPIXEL(data->format), data->debug))
 34.1006 -	{
 34.1007 -	    SDL_SetError("GAPI_Init: unknown hardware");
 34.1008 -	    GAPI_Quit(data);
 34.1009 -	    return 0;
 34.1010 -	}
 34.1011 +        if(0 == data->format ||
 34.1012 +            0 > WINCE_FixedGeometry(&data->fb, SDL_BYTESPERPIXEL(data->format), data->debug))
 34.1013 +        {
 34.1014 +            SDL_SetError("GAPI_Init: unknown hardware");
 34.1015 +            GAPI_Quit(data);
 34.1016 +            return 0;
 34.1017 +        }
 34.1018      }
 34.1019  
 34.1020      return data->gapi && data->pixels ? 1 : 0;
 34.1021 @@ -994,28 +1004,30 @@
 34.1022  {
 34.1023      if(data->gapi)
 34.1024      {
 34.1025 -	if(data->gapi->GXCloseDisplay) data->gapi->GXCloseDisplay(); 
 34.1026 -	if(data->gapi->hGapiLib)  FreeLibrary(data->gapi->hGapiLib);
 34.1027 +        if(data->gapi->GXCloseDisplay) data->gapi->GXCloseDisplay(); 
 34.1028 +        if(data->gapi->hGapiLib)  FreeLibrary(data->gapi->hGapiLib);
 34.1029  
 34.1030 -	SDL_free(data->gapi);
 34.1031 +        SDL_free(data->gapi);
 34.1032          data->gapi = NULL;
 34.1033      }
 34.1034  }
 34.1035  
 34.1036  int RAW_Init(WINCE_RenderData* data)
 34.1037  {
 34.1038 +    RawFrameBufferInfo rfbi = { 0 };
 34.1039 +    HDC hdc;
 34.1040 +    int result;
 34.1041      const char* preferably = SDL_getenv("SDL_VIDEO_RENDERER");
 34.1042      if(preferably && 0 != SDL_strcasecmp(preferably, RAW_RENDER_NAME)) return 0;
 34.1043  
 34.1044 -    RawFrameBufferInfo rfbi = { 0 };
 34.1045 -    HDC hdc = GetDC(NULL);
 34.1046 -    int result = ExtEscape(hdc, GETRAWFRAMEBUFFER, 0, NULL, sizeof(RawFrameBufferInfo), (char *) &rfbi);
 34.1047 +    hdc = GetDC(NULL);
 34.1048 +    result = ExtEscape(hdc, GETRAWFRAMEBUFFER, 0, NULL, sizeof(RawFrameBufferInfo), (char *) &rfbi);
 34.1049      ReleaseDC(NULL, hdc);
 34.1050  
 34.1051      //disable
 34.1052      if(result == 0 || rfbi.pFramePointer == 0 ||
 34.1053 -    	rfbi.cxPixels == 0 || rfbi.cyPixels == 0 ||
 34.1054 -	rfbi.cxStride == 0 || rfbi.cyStride == 0) return 0;
 34.1055 +            rfbi.cxPixels == 0 || rfbi.cyPixels == 0 ||
 34.1056 +        rfbi.cxStride == 0 || rfbi.cyStride == 0) return 0;
 34.1057  
 34.1058      data->flags     = FB_RAW_MODE;
 34.1059  
 34.1060 @@ -1029,19 +1041,19 @@
 34.1061      data->fb.offset = 0;
 34.1062  
 34.1063      if((FORMAT_565 & rfbi.wFormat) || 16 == rfbi.wBPP)
 34.1064 -	data->format = SDL_PIXELFORMAT_RGB565;
 34.1065 +        data->format = SDL_PIXELFORMAT_RGB565;
 34.1066      else
 34.1067      if((FORMAT_555 & rfbi.wFormat) || 15 == rfbi.wBPP)
 34.1068 -	data->format = SDL_PIXELFORMAT_RGB555;
 34.1069 +        data->format = SDL_PIXELFORMAT_RGB555;
 34.1070      else
 34.1071 -	data->format = 0;
 34.1072 +        data->format = 0;
 34.1073  
 34.1074      if(0 == data->format ||
 34.1075 -	0 > WINCE_FixedGeometry(&data->fb, SDL_BYTESPERPIXEL(data->format), data->debug))
 34.1076 +        0 > WINCE_FixedGeometry(&data->fb, SDL_BYTESPERPIXEL(data->format), data->debug))
 34.1077      {
 34.1078 -	SDL_SetError("RAW_Init: unknown hardware");
 34.1079 -	RAW_Quit(data);
 34.1080 -	return 0;
 34.1081 +        SDL_SetError("RAW_Init: unknown hardware");
 34.1082 +        RAW_Quit(data);
 34.1083 +        return 0;
 34.1084      }
 34.1085  
 34.1086      data->pixels = rfbi.pFramePointer;
 34.1087 @@ -1060,50 +1072,50 @@
 34.1088      // set correct start offset
 34.1089      switch(orientation)
 34.1090      {
 34.1091 -	case ORIENTATION_UP:
 34.1092 -	    fb->offset = 0;
 34.1093 -	    break;
 34.1094 +        case ORIENTATION_UP:
 34.1095 +            fb->offset = 0;
 34.1096 +            break;
 34.1097  
 34.1098 -	case ORIENTATION_LEFT:
 34.1099 -	    fb->offset = __abs(fb->ypitch * (fb->height - 1));
 34.1100 -	    break;
 34.1101 +        case ORIENTATION_LEFT:
 34.1102 +            fb->offset = __abs(fb->ypitch * (fb->height - 1));
 34.1103 +            break;
 34.1104  
 34.1105 -	case ORIENTATION_RIGHT:
 34.1106 -	    fb->offset = __abs(fb->xpitch * (fb->width - 1));
 34.1107 -	    break;
 34.1108 +        case ORIENTATION_RIGHT:
 34.1109 +            fb->offset = __abs(fb->xpitch * (fb->width - 1));
 34.1110 +            break;
 34.1111  
 34.1112 -	case ORIENTATION_DOWN:
 34.1113 -	    fb->offset = __abs(fb->xpitch * (fb->width - 1) +
 34.1114 -				fb->ypitch * (fb->height - 1));
 34.1115 -	    break;
 34.1116 +        case ORIENTATION_DOWN:
 34.1117 +            fb->offset = __abs(fb->xpitch * (fb->width - 1) +
 34.1118 +                                fb->ypitch * (fb->height - 1));
 34.1119 +            break;
 34.1120  
 34.1121 -	default: break;
 34.1122 +        default: break;
 34.1123      }
 34.1124  
 34.1125      //if(orientation != ORIENTATION_UP)
 34.1126      switch(orientation)
 34.1127      {
 34.1128 -	case ORIENTATION_LEFT: FrameBufferRotate(fb, ORIENTATION_RIGHT); break;
 34.1129 -	case ORIENTATION_RIGHT:FrameBufferRotate(fb, ORIENTATION_LEFT); break;
 34.1130 -	case ORIENTATION_DOWN: FrameBufferRotate(fb, ORIENTATION_DOWN); break;
 34.1131 +        case ORIENTATION_LEFT: FrameBufferRotate(fb, ORIENTATION_RIGHT); break;
 34.1132 +        case ORIENTATION_RIGHT:FrameBufferRotate(fb, ORIENTATION_LEFT); break;
 34.1133 +        case ORIENTATION_DOWN: FrameBufferRotate(fb, ORIENTATION_DOWN); break;
 34.1134  
 34.1135 -	default: break;
 34.1136 +        default: break;
 34.1137      }
 34.1138  }
 34.1139  
 34.1140  int GetFrameBufferOrientation(const FrameBufferInfo* src)
 34.1141  {
 34.1142      if(src->xpitch > 0 && src->ypitch > 0)
 34.1143 -	return ORIENTATION_UP;
 34.1144 +        return ORIENTATION_UP;
 34.1145      else
 34.1146      if(src->xpitch > 0 && src->ypitch < 0)
 34.1147 -	return ORIENTATION_LEFT;
 34.1148 +        return ORIENTATION_LEFT;
 34.1149      else
 34.1150      if(src->xpitch < 0 && src->ypitch > 0)
 34.1151 -	return ORIENTATION_RIGHT;
 34.1152 +        return ORIENTATION_RIGHT;
 34.1153      else
 34.1154      if(src->xpitch < 0 && src->ypitch < 0)
 34.1155 -	return ORIENTATION_DOWN;
 34.1156 +        return ORIENTATION_DOWN;
 34.1157  
 34.1158      return ORIENTATION_UNKNOWN;
 34.1159  }
 34.1160 @@ -1117,28 +1129,28 @@
 34.1161      switch(orientation)
 34.1162      {
 34.1163          case ORIENTATION_LEFT:
 34.1164 -	    dst->width  = src.height;
 34.1165 -	    dst->height = src.width;
 34.1166 -	    dst->xpitch = src.ypitch;
 34.1167 -	    dst->ypitch = -src.xpitch;
 34.1168 -	    dst->offset = src.offset + src.xpitch * (src.width - 1);
 34.1169 -	    break;
 34.1170 +            dst->width  = src.height;
 34.1171 +            dst->height = src.width;
 34.1172 +            dst->xpitch = src.ypitch;
 34.1173 +            dst->ypitch = -src.xpitch;
 34.1174 +            dst->offset = src.offset + src.xpitch * (src.width - 1);
 34.1175 +            break;
 34.1176  
 34.1177          case ORIENTATION_RIGHT:
 34.1178 -	    dst->width  = src.height;
 34.1179 -	    dst->height = src.width;
 34.1180 -	    dst->xpitch = -src.ypitch;
 34.1181 -	    dst->ypitch = src.xpitch;
 34.1182 -	    dst->offset = src.offset + src.ypitch * (src.height - 1);
 34.1183 -	    break;
 34.1184 +            dst->width  = src.height;
 34.1185 +            dst->height = src.width;
 34.1186 +            dst->xpitch = -src.ypitch;
 34.1187 +            dst->ypitch = src.xpitch;
 34.1188 +            dst->offset = src.offset + src.ypitch * (src.height - 1);
 34.1189 +            break;
 34.1190  
 34.1191          case ORIENTATION_DOWN:
 34.1192 -	    FrameBufferRotate(dst, ORIENTATION_LEFT);
 34.1193 -	    FrameBufferRotate(dst, ORIENTATION_LEFT);
 34.1194 -	    break;
 34.1195 +            FrameBufferRotate(dst, ORIENTATION_LEFT);
 34.1196 +            FrameBufferRotate(dst, ORIENTATION_LEFT);
 34.1197 +            break;
 34.1198  
 34.1199          default:
 34.1200 -	    break;
 34.1201 +            break;
 34.1202      }
 34.1203  }
 34.1204  
 34.1205 @@ -1146,31 +1158,31 @@
 34.1206  {
 34.1207      switch(orientation)
 34.1208      {
 34.1209 -	case ORIENTATION_UP:
 34.1210 -	    break;
 34.1211 +        case ORIENTATION_UP:
 34.1212 +            break;
 34.1213  
 34.1214 -	case ORIENTATION_LEFT:
 34.1215 -	{
 34.1216 -	    int temp = pt->y;
 34.1217 -	    pt->y = fb->height - pt->x;
 34.1218 -	    pt->x = temp;
 34.1219 -	}
 34.1220 -	    break;
 34.1221 +        case ORIENTATION_LEFT:
 34.1222 +        {
 34.1223 +            int temp = pt->y;
 34.1224 +            pt->y = fb->height - pt->x;
 34.1225 +            pt->x = temp;
 34.1226 +        }
 34.1227 +            break;
 34.1228  
 34.1229 -	case ORIENTATION_RIGHT:
 34.1230 -	{
 34.1231 -	    int temp = pt->x;
 34.1232 -	    pt->x = fb->width - pt->y;
 34.1233 -	    pt->y = temp;
 34.1234 -	}
 34.1235 -	    break;
 34.1236 +        case ORIENTATION_RIGHT:
 34.1237 +        {
 34.1238 +            int temp = pt->x;
 34.1239 +            pt->x = fb->width - pt->y;
 34.1240 +            pt->y = temp;
 34.1241 +        }
 34.1242 +            break;
 34.1243  
 34.1244 -	case ORIENTATION_DOWN:
 34.1245 -	    pt->x = fb->width  - pt->x;
 34.1246 -	    pt->y = fb->height - pt->y;
 34.1247 -	    break;
 34.1248 +        case ORIENTATION_DOWN:
 34.1249 +            pt->x = fb->width  - pt->x;
 34.1250 +            pt->y = fb->height - pt->y;
 34.1251 +            break;
 34.1252  
 34.1253 -	default: break;
 34.1254 +        default: break;
 34.1255      }
 34.1256  }
 34.1257  
 34.1258 @@ -1196,14 +1208,14 @@
 34.1259  
 34.1260      // DMDO_0, DMDO_90, DMDO_180, DMDO_270
 34.1261      if(DISP_CHANGE_BADMODE != ChangeDisplaySettingsEx(NULL, &sDevMode, 0, CDS_TEST, NULL))
 34.1262 -	switch(sDevMode.dmDisplayOrientation)
 34.1263 -	{
 34.1264 -	    case DMDO_0:	return DMDO_0;
 34.1265 -	    case DMDO_90:	return DMDO_90;
 34.1266 -	    case DMDO_180:	return DMDO_180;
 34.1267 -	    case DMDO_270:	return DMDO_270;
 34.1268 -	    default: break;
 34.1269 -	}
 34.1270 +        switch(sDevMode.dmDisplayOrientation)
 34.1271 +        {
 34.1272 +            case DMDO_0:        return DMDO_0;
 34.1273 +            case DMDO_90:        return DMDO_90;
 34.1274 +            case DMDO_180:        return DMDO_180;
 34.1275 +            case DMDO_270:        return DMDO_270;
 34.1276 +            default: break;
 34.1277 +        }
 34.1278  
 34.1279      SDL_SetError("WINCE_GetDMOrientation: ChangeDisplaySettingsEx return BADMODE");
 34.1280      return -1;
 34.1281 @@ -1217,15 +1229,15 @@
 34.1282  
 34.1283      switch(orientation)
 34.1284      {
 34.1285 -	case DMDO_0:	sDevMode.dmDisplayOrientation = DMDO_0;   break;
 34.1286 -	case DMDO_90:	sDevMode.dmDisplayOrientation = DMDO_90;  break;
 34.1287 -	case DMDO_180:	sDevMode.dmDisplayOrientation = DMDO_180; break;
 34.1288 -	case DMDO_270:	sDevMode.dmDisplayOrientation = DMDO_270; break;
 34.1289 -	default: return 0;
 34.1290 +        case DMDO_0:        sDevMode.dmDisplayOrientation = DMDO_0;   break;
 34.1291 +        case DMDO_90:        sDevMode.dmDisplayOrientation = DMDO_90;  break;
 34.1292 +        case DMDO_180:        sDevMode.dmDisplayOrientation = DMDO_180; break;
 34.1293 +        case DMDO_270:        sDevMode.dmDisplayOrientation = DMDO_270; break;
 34.1294 +        default: return 0;
 34.1295      }
 34.1296  
 34.1297      if(DISP_CHANGE_BADMODE != ChangeDisplaySettingsEx(NULL, &sDevMode, 0, CDS_RESET, NULL))
 34.1298 -	return 1;
 34.1299 +        return 1;
 34.1300  
 34.1301      SDL_SetError("WINCE_SetDMOrientation: ChangeDisplaySettingsEx return BADMODE");
 34.1302      return -1;
 34.1303 @@ -1233,13 +1245,15 @@
 34.1304  
 34.1305  void FrameBufferDumpInfo(const FrameBufferInfo* fb, const char* name)
 34.1306  {
 34.1307 +    int orientation;
 34.1308 +
 34.1309      printf("%s fb.width:       %d\n", name, fb->width);
 34.1310      printf("%s fb.height:      %d\n", name, fb->height);
 34.1311      printf("%s fb.xpitch:      %d\n", name, fb->xpitch);
 34.1312      printf("%s fb.ypitch:      %d\n", name, fb->ypitch);
 34.1313      printf("%s fb.offset:      %d\n", name, fb->offset);
 34.1314  
 34.1315 -    int orientation = GetFrameBufferOrientation(fb);
 34.1316 +    orientation = GetFrameBufferOrientation(fb);
 34.1317      printf("%s fb.orientation: %d, %s\n", name, orientation, GetOrientationName(orientation));
 34.1318  }
 34.1319  
 34.1320 @@ -1247,34 +1261,34 @@
 34.1321  {
 34.1322      if(2 == fb->xpitch)
 34.1323      {
 34.1324 -	switch(width)
 34.1325 -	{
 34.1326 -	    case 1:
 34.1327 -		*dst = *src;
 34.1328 -		break;
 34.1329 +        switch(width)
 34.1330 +        {
 34.1331 +            case 1:
 34.1332 +                *dst = *src;
 34.1333 +                break;
 34.1334  
 34.1335 -	    case 2:
 34.1336 -		*((Uint32*) dst) = *((Uint32*) src);
 34.1337 -		break;
 34.1338 +            case 2:
 34.1339 +                *((Uint32*) dst) = *((Uint32*) src);
 34.1340 +                break;
 34.1341  
 34.1342 -	    default:
 34.1343 -		SDL_memcpy(dst, src, width * 2);
 34.1344 -		break;
 34.1345 -	}
 34.1346 +            default:
 34.1347 +                SDL_memcpy(dst, src, width * 2);
 34.1348 +                break;
 34.1349 +        }
 34.1350      }
 34.1351      else
 34.1352      if(-2 == fb->xpitch)
 34.1353      {
 34.1354 -	while(width--)
 34.1355 -	    *dst-- = *src++;
 34.1356 +        while(width--)
 34.1357 +            *dst-- = *src++;
 34.1358      }
 34.1359      else
 34.1360      {
 34.1361 -	while(width--)
 34.1362 -	{
 34.1363 -	    *dst = *src++;
 34.1364 -	    dst += fb->xpitch / 2;
 34.1365 -	}
 34.1366 +        while(width--)
 34.1367 +        {
 34.1368 +            *dst = *src++;
 34.1369 +            dst += fb->xpitch / 2;
 34.1370 +        }
 34.1371      }
 34.1372  }
 34.1373  
    35.1 --- a/src/video/windows/SDL_gdirender.c	Mon Jan 24 15:10:16 2011 -0800
    35.2 +++ b/src/video/windows/SDL_gdirender.c	Mon Jan 24 15:46:11 2011 -0800
    35.3 @@ -167,8 +167,10 @@
    35.4      SDL_WindowData *windowdata = (SDL_WindowData *) window->driverdata;
    35.5      SDL_Renderer *renderer;
    35.6      GDI_RenderData *data;
    35.7 +#ifndef NO_GETDIBBITS
    35.8      int bmi_size;
    35.9      HBITMAP hbm;
   35.10 +#endif
   35.11      int i, n;
   35.12  
   35.13      renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));
    36.1 --- a/src/video/windows/SDL_windowsevents.c	Mon Jan 24 15:10:16 2011 -0800
    36.2 +++ b/src/video/windows/SDL_windowsevents.c	Mon Jan 24 15:46:11 2011 -0800
    36.3 @@ -192,20 +192,20 @@
    36.4  
    36.5  	case WM_MOUSEMOVE:
    36.6  #ifdef _WIN32_WCE
    36.7 -	/* transform coords for VGA, WVGA... */
    36.8 -	{
    36.9 -	    SDL_VideoData *videodata = data->videodata;
   36.10 -	    if(videodata->CoordTransform &&
   36.11 -		(videodata->render == RENDER_GAPI || videodata->render == RENDER_RAW))
   36.12 -	    {
   36.13 -		POINT pt;
   36.14 -		pt.x = LOWORD(lParam);
   36.15 -		pt.y = HIWORD(lParam);
   36.16 -		videodata->CoordTransform(data->window, &pt);
   36.17 -    		SDL_SendMouseMotion(data->window, 0, pt.x, pt.y);
   36.18 -		break;
   36.19 -	    }
   36.20 -	}
   36.21 +        /* transform coords for VGA, WVGA... */
   36.22 +        {
   36.23 +            SDL_VideoData *videodata = data->videodata;
   36.24 +            if(videodata->CoordTransform &&
   36.25 +                (videodata->render == RENDER_GAPI || videodata->render == RENDER_RAW))
   36.26 +            {
   36.27 +                POINT pt;
   36.28 +                pt.x = LOWORD(lParam);
   36.29 +                pt.y = HIWORD(lParam);
   36.30 +                videodata->CoordTransform(data->window, &pt);
   36.31 +                    SDL_SendMouseMotion(data->window, 0, pt.x, pt.y);
   36.32 +                break;
   36.33 +            }
   36.34 +        }
   36.35  #endif
   36.36          SDL_SendMouseMotion(data->window, 0, LOWORD(lParam), HIWORD(lParam));
   36.37          break;
   36.38 @@ -252,12 +252,15 @@
   36.39              break;
   36.40          }
   36.41  
   36.42 +#ifdef WM_MOUSELEAVE
   36.43 +    /* FIXME: Do we need the SDL 1.2 hack to generate WM_MOUSELEAVE now? */
   36.44      case WM_MOUSELEAVE:
   36.45          if (SDL_GetMouseFocus() == data->window) {
   36.46              SDL_SetMouseFocus(NULL);
   36.47          }
   36.48          returnCode = 0;
   36.49          break;
   36.50 +#endif /* WM_MOUSELEAVE */
   36.51  
   36.52      case WM_SYSKEYDOWN:
   36.53      case WM_KEYDOWN:
   36.54 @@ -382,13 +385,16 @@
   36.55          returnCode = 0;
   36.56          break;
   36.57  
   36.58 +#ifdef WM_INPUTLANGCHANGE
   36.59      case WM_INPUTLANGCHANGE:
   36.60          {
   36.61              WIN_UpdateKeymap();
   36.62          }
   36.63          returnCode = 1;
   36.64          break;
   36.65 +#endif /* WM_INPUTLANGCHANGE */
   36.66  
   36.67 +#ifdef WM_GETMINMAXINFO
   36.68      case WM_GETMINMAXINFO:
   36.69          {
   36.70              MINMAXINFO *info;
   36.71 @@ -447,6 +453,7 @@
   36.72          }
   36.73          returnCode = 0;
   36.74          break;
   36.75 +#endif /* WM_GETMINMAXINFO */
   36.76  
   36.77      case WM_WINDOWPOSCHANGED:
   36.78          {
   36.79 @@ -534,6 +541,7 @@
   36.80          }
   36.81          return (1);
   36.82  
   36.83 +#if defined(SC_SCREENSAVE) || defined(SC_MONITORPOWER)
   36.84      case WM_SYSCOMMAND:
   36.85          {
   36.86              /* Don't start the screensaver or blank the monitor in fullscreen apps */
   36.87 @@ -545,6 +553,7 @@
   36.88              }
   36.89          }
   36.90          break;
   36.91 +#endif /* System has screensaver support */
   36.92  
   36.93      case WM_CLOSE:
   36.94          {
   36.95 @@ -656,7 +665,9 @@
   36.96      }
   36.97      if (!name && !SDL_Appname) {
   36.98          name = "SDL_app";
   36.99 +#if defined(CS_BYTEALIGNCLIENT) || defined(CS_OWNDC)
  36.100          SDL_Appstyle = (CS_BYTEALIGNCLIENT | CS_OWNDC);
  36.101 +#endif
  36.102          SDL_Instance = hInst ? hInst : GetModuleHandle(NULL);
  36.103      }
  36.104  
    37.1 --- a/src/video/windows/SDL_windowskeyboard.c	Mon Jan 24 15:10:16 2011 -0800
    37.2 +++ b/src/video/windows/SDL_windowskeyboard.c	Mon Jan 24 15:46:11 2011 -0800
    37.3 @@ -21,6 +21,10 @@
    37.4  */
    37.5  #include "SDL_config.h"
    37.6  
    37.7 +#ifdef _WIN32_WCE
    37.8 +#define SDL_DISABLE_WINDOWS_IME
    37.9 +#endif
   37.10 +
   37.11  #include "SDL_windowsvideo.h"
   37.12  
   37.13  #include "../../events/SDL_keyboard_c.h"
   37.14 @@ -29,10 +33,12 @@
   37.15  #include <imm.h>
   37.16  #include <oleauto.h>
   37.17  
   37.18 +#ifndef SDL_DISABLE_WINDOWS_IME
   37.19  static void IME_Init(SDL_VideoData *videodata, HWND hwnd);
   37.20  static void IME_Enable(SDL_VideoData *videodata, HWND hwnd);
   37.21  static void IME_Disable(SDL_VideoData *videodata, HWND hwnd);
   37.22  static void IME_Quit(SDL_VideoData *videodata);
   37.23 +#endif /* !SDL_DISABLE_WINDOWS_IME */
   37.24  
   37.25  #ifndef MAPVK_VK_TO_VSC
   37.26  #define MAPVK_VK_TO_VSC     0
   37.27 @@ -172,12 +178,15 @@
   37.28  void
   37.29  WIN_QuitKeyboard(_THIS)
   37.30  {
   37.31 +#ifndef SDL_DISABLE_WINDOWS_IME
   37.32      IME_Quit((SDL_VideoData *)_this->driverdata);
   37.33 +#endif
   37.34  }
   37.35  
   37.36  void
   37.37  WIN_StartTextInput(_THIS)
   37.38  {
   37.39 +#ifndef SDL_DISABLE_WINDOWS_IME
   37.40      SDL_Window *window = SDL_GetKeyboardFocus();
   37.41      if (window) {
   37.42          HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
   37.43 @@ -186,11 +195,13 @@
   37.44          IME_Init(videodata, hwnd);
   37.45          IME_Enable(videodata, hwnd);
   37.46      }
   37.47 +#endif /* !SDL_DISABLE_WINDOWS_IME */
   37.48  }
   37.49  
   37.50  void
   37.51  WIN_StopTextInput(_THIS)
   37.52  {
   37.53 +#ifndef SDL_DISABLE_WINDOWS_IME
   37.54      SDL_Window *window = SDL_GetKeyboardFocus();
   37.55      if (window) {
   37.56          HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
   37.57 @@ -198,6 +209,7 @@
   37.58          IME_Init(videodata, hwnd);
   37.59          IME_Disable(videodata, hwnd);
   37.60      }
   37.61 +#endif /* !SDL_DISABLE_WINDOWS_IME */
   37.62  }
   37.63  
   37.64  void
   37.65 @@ -207,6 +219,21 @@
   37.66      videodata->ime_rect = *rect;
   37.67  }
   37.68  
   37.69 +#ifdef SDL_DISABLE_WINDOWS_IME
   37.70 +
   37.71 +
   37.72 +SDL_bool
   37.73 +IME_HandleMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM *lParam, SDL_VideoData *videodata)
   37.74 +{
   37.75 +    return SDL_FALSE;
   37.76 +}
   37.77 +
   37.78 +void IME_Present(SDL_VideoData *videodata)
   37.79 +{
   37.80 +}
   37.81 +
   37.82 +#else
   37.83 +
   37.84  #ifdef __GNUC__
   37.85  #undef DEFINE_GUID
   37.86  #define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) static const GUID n = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
   37.87 @@ -1552,4 +1579,6 @@
   37.88      SDL_RenderCopy(videodata->ime_candtex, NULL, &videodata->ime_candlistrect);
   37.89  }
   37.90  
   37.91 +#endif /* SDL_DISABLE_WINDOWS_IME */
   37.92 +
   37.93  /* vi: set ts=4 sw=4 expandtab: */
    38.1 --- a/src/video/windows/SDL_windowsmodes.c	Mon Jan 24 15:10:16 2011 -0800
    38.2 +++ b/src/video/windows/SDL_windowsmodes.c	Mon Jan 24 15:46:11 2011 -0800
    38.3 @@ -23,13 +23,19 @@
    38.4  
    38.5  #include "SDL_windowsvideo.h"
    38.6  
    38.7 +/* Windows CE compatibility */
    38.8 +#ifndef CDS_FULLSCREEN
    38.9 +#define CDS_FULLSCREEN 0
   38.10 +#endif
   38.11  
   38.12  static SDL_bool
   38.13  WIN_GetDisplayMode(LPCTSTR deviceName, DWORD index, SDL_DisplayMode * mode)
   38.14  {
   38.15      SDL_DisplayModeData *data;
   38.16      DEVMODE devmode;
   38.17 +#ifndef _WIN32_WCE
   38.18      HDC hdc;
   38.19 +#endif
   38.20  
   38.21      devmode.dmSize = sizeof(devmode);
   38.22      devmode.dmDriverExtra = 0;
    39.1 --- a/src/video/windows/SDL_windowsvideo.c	Mon Jan 24 15:10:16 2011 -0800
    39.2 +++ b/src/video/windows/SDL_windowsvideo.c	Mon Jan 24 15:46:11 2011 -0800
    39.3 @@ -161,9 +161,9 @@
    39.4  
    39.5  	data->userDLL = LoadLibrary(TEXT("USER32.DLL"));
    39.6  	if (data->userDLL) {
    39.7 -		data->CloseTouchInputHandle = (BOOL (WINAPI *)( HTOUCHINPUT )) GetProcAddress(data->userDLL, "CloseTouchInputHandle");
    39.8 -		data->GetTouchInputInfo = (BOOL (WINAPI *)( HTOUCHINPUT, UINT, PTOUCHINPUT, int )) GetProcAddress(data->userDLL, "GetTouchInputInfo");
    39.9 -		data->RegisterTouchWindow = (BOOL (WINAPI *)( HWND, ULONG )) GetProcAddress(data->userDLL, "RegisterTouchWindow");
   39.10 +		data->CloseTouchInputHandle = (BOOL (WINAPI *)( HTOUCHINPUT )) GetProcAddress(data->userDLL, TEXT("CloseTouchInputHandle"));
   39.11 +		data->GetTouchInputInfo = (BOOL (WINAPI *)( HTOUCHINPUT, UINT, PTOUCHINPUT, int )) GetProcAddress(data->userDLL, TEXT("GetTouchInputInfo"));
   39.12 +		data->RegisterTouchWindow = (BOOL (WINAPI *)( HWND, ULONG )) GetProcAddress(data->userDLL, TEXT("RegisterTouchWindow"));
   39.13  	}
   39.14  
   39.15      /* Set the function pointers */
   39.16 @@ -222,11 +222,7 @@
   39.17  }
   39.18  
   39.19  VideoBootStrap WINDOWS_bootstrap = {
   39.20 -#ifdef _WIN32_WCE
   39.21 -    "wince", "SDL WinCE video driver", WINCE_Available, WIN_CreateDevice
   39.22 -#else
   39.23 -    "windows", "SDL Win32/64 video driver", WIN_Available, WIN_CreateDevice
   39.24 -#endif
   39.25 +    "windows", "SDL Windows video driver", WIN_Available, WIN_CreateDevice
   39.26  };
   39.27  
   39.28  int
    40.1 --- a/src/video/windows/SDL_windowsvideo.h	Mon Jan 24 15:10:16 2011 -0800
    40.2 +++ b/src/video/windows/SDL_windowsvideo.h	Mon Jan 24 15:46:11 2011 -0800
    40.3 @@ -36,7 +36,7 @@
    40.4  
    40.5  #include <windows.h>
    40.6  
    40.7 -#ifndef __GNUC__
    40.8 +#if defined(_MSC_VER) && !defined(_WIN32_WCE)
    40.9  #include <msctf.h>
   40.10  #else
   40.11  #include "SDL_msctf.h"
    41.1 --- a/src/video/windows/SDL_windowswindow.c	Mon Jan 24 15:10:16 2011 -0800
    41.2 +++ b/src/video/windows/SDL_windowswindow.c	Mon Jan 24 15:46:11 2011 -0800
    41.3 @@ -32,6 +32,10 @@
    41.4  #include "SDL_syswm.h"
    41.5  #include "SDL_gapirender.h"
    41.6  
    41.7 +/* Windows CE compatibility */
    41.8 +#ifndef SWP_NOCOPYBITS
    41.9 +#define SWP_NOCOPYBITS 0
   41.10 +#endif
   41.11  
   41.12  /* Fake window to help with DirectInput events. */
   41.13  HWND SDL_HelperWindow = NULL;
   41.14 @@ -68,13 +72,21 @@
   41.15      }
   41.16  
   41.17      /* Set up the window proc function */
   41.18 +#ifdef GWLP_WNDPROC
   41.19      data->wndproc = (WNDPROC) GetWindowLongPtr(hwnd, GWLP_WNDPROC);
   41.20      if (data->wndproc == WIN_WindowProc) {
   41.21          data->wndproc = NULL;
   41.22 -    }
   41.23 -    else {
   41.24 +    } else {
   41.25          SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR) WIN_WindowProc);
   41.26      }
   41.27 +#else
   41.28 +    data->wndproc = (WNDPROC) GetWindowLong(hwnd, GWL_WNDPROC);
   41.29 +    if (data->wndproc == WIN_WindowProc) {
   41.30 +        data->wndproc = NULL;
   41.31 +    } else {
   41.32 +        SetWindowLong(hwnd, GWL_WNDPROC, (LONG_PTR) WIN_WindowProc);
   41.33 +    }
   41.34 +#endif
   41.35  
   41.36      /* Fill in the SDL window with the window data */
   41.37      {
   41.38 @@ -112,14 +124,20 @@
   41.39          } else {
   41.40              window->flags &= ~SDL_WINDOW_RESIZABLE;
   41.41          }
   41.42 +#ifdef WS_MAXIMIZE
   41.43          if (style & WS_MAXIMIZE) {
   41.44              window->flags |= SDL_WINDOW_MAXIMIZED;
   41.45 -        } else {
   41.46 +        } else
   41.47 +#endif
   41.48 +        {
   41.49              window->flags &= ~SDL_WINDOW_MAXIMIZED;
   41.50          }
   41.51 +#ifdef WS_MINIMIZE
   41.52          if (style & WS_MINIMIZE) {
   41.53              window->flags |= SDL_WINDOW_MINIMIZED;
   41.54 -        } else {
   41.55 +        } else
   41.56 +#endif
   41.57 +        {
   41.58              window->flags &= ~SDL_WINDOW_MINIMIZED;
   41.59          }
   41.60      }
    42.1 --- a/test/testgesture.c	Mon Jan 24 15:10:16 2011 -0800
    42.2 +++ b/test/testgesture.c	Mon Jan 24 15:46:11 2011 -0800
    42.3 @@ -19,14 +19,14 @@
    42.4  #define PRIu32 "u"
    42.5  #endif
    42.6  #ifndef PRIs64
    42.7 -#ifdef __WINDOWS__
    42.8 +#ifdef __WIN32__
    42.9  #define PRIs64 "I64"
   42.10  #else
   42.11  #define PRIs64 "lld"
   42.12  #endif
   42.13  #endif
   42.14  #ifndef PRIu64
   42.15 -#ifdef __WINDOWS__
   42.16 +#ifdef __WIN32__
   42.17  #define PRIu64 "I64u"
   42.18  #else
   42.19  #define PRIu64 "llu"