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 5086 c2539ff054c8
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
--- a/VisualCE/SDL.sln	Mon Jan 24 15:10:16 2011 -0800
+++ b/VisualCE/SDL.sln	Mon Jan 24 15:46:11 2011 -0800
@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "SDL\SDL.vcproj", "{C598024D-8030-4F9C-AB76-69BF4CA0645F}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "SDLmain\SDLmain.vcproj", "{5AC88B84-5EAA-4C1E-948D-332DA34227F6}"
--- a/VisualCE/SDL/SDL.vcproj	Mon Jan 24 15:10:16 2011 -0800
+++ b/VisualCE/SDL/SDL.vcproj	Mon Jan 24 15:46:11 2011 -0800
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9.00"
 	Name="SDL"
 	ProjectGUID="{C598024D-8030-4F9C-AB76-69BF4CA0645F}"
 	RootNamespace="SDL"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -93,6 +94,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="_DllMainCRTStartup"
 				BaseAddress="0x00100000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib"
 			/>
 			<Tool
@@ -107,6 +110,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SDL.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -195,6 +201,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="_DllMainCRTStartup"
 				BaseAddress="0x00100000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib"
 			/>
 			<Tool
@@ -209,6 +217,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SDL.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -296,6 +307,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="_DllMainCRTStartup"
 				BaseAddress="0x00100000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib"
 			/>
 			<Tool
@@ -310,6 +323,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SDL.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -396,6 +412,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="_DllMainCRTStartup"
 				BaseAddress="0x00100000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib"
 			/>
 			<Tool
@@ -410,6 +428,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SDL.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -500,6 +521,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="_DllMainCRTStartup"
 				BaseAddress="0x00100000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib"
 			/>
 			<Tool
@@ -514,6 +537,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SDL.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -606,6 +632,8 @@
 				LinkTimeCodeGeneration="1"
 				EntryPointSymbol="_DllMainCRTStartup"
 				BaseAddress="0x00100000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib"
 			/>
 			<Tool
@@ -620,6 +648,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SDL.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -643,1294 +674,238 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
+				RelativePath="..\..\src\libm\e_atan2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\libm\e_log.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\libm\e_pow.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\libm\e_rem_pio2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\libm\e_sqrt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\libm\k_cos.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\libm\k_rem_pio2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\libm\k_sin.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\libm\s_atan.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\libm\s_copysign.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\libm\s_cos.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\libm\s_fabs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\libm\s_floor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\libm\s_scalbn.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\libm\s_sin.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\SDL.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\video\SDL_alphamult.c"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\events\SDL_active.c"
+				RelativePath="..\..\src\SDL_assert.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\atomic\SDL_atomic.c"
+				>
 			</File>
 			<File
 				RelativePath="..\..\src\audio\SDL_audio.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\audio\SDL_audiocvt.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\audio\SDL_audiodev.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\audio\SDL_audiotypecvt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\SDL_blendfillrect.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\SDL_blendline.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\SDL_blendpoint.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\SDL_blendrect.c"
+				>
 			</File>
 			<File
 				RelativePath="..\..\src\video\SDL_blit.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\video\SDL_blit_0.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\video\SDL_blit_1.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\video\SDL_blit_A.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\video\SDL_blit_auto.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\SDL_blit_copy.c"
+				>
 			</File>
 			<File
 				RelativePath="..\..\src\video\SDL_blit_N.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\video\SDL_blit_slow.c"
+				>
 			</File>
 			<File
 				RelativePath="..\..\src\video\SDL_bmp.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\video\windows\SDL_ceddrawrender.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\SDL_clipboard.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\events\SDL_clipboardevents.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\SDL_compat.c"
+				>
 			</File>
 			<File
 				RelativePath="..\..\src\cpuinfo\SDL_cpuinfo.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\video\SDL_cursor.c"
+				RelativePath="..\..\src\video\windows\SDL_d3drender.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\audio\windib\SDL_dibaudio.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\video\windib\SDL_dibevents.c"
-				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\video\windib\SDL_dibvideo.c"
-				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\audio\disk\SDL_diskaudio.c"
 				>
 			</File>
 			<File
+				RelativePath="..\..\src\video\SDL_drawline.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\SDL_drawpoint.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\SDL_drawrect.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\audio\dummy\SDL_dummyaudio.c"
 				>
 			</File>
 			<File
 				RelativePath="..\..\src\SDL_error.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\events\SDL_events.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\events\SDL_expose.c"
-				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\SDL_fatal.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\video\SDL_fillrect.c"
+				>
 			</File>
 			<File
 				RelativePath="..\..\src\video\SDL_gamma.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\video\windows\SDL_gapirender.c"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\video\gapi\sdl_gapivideo.c"
+				RelativePath="..\..\src\video\windows\SDL_gdirender.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\events\SDL_gesture.c"
+				>
 			</File>
 			<File
 				RelativePath="..\..\src\stdlib\SDL_getenv.c"
 				>
 			</File>
 			<File
+				RelativePath="..\..\src\haptic\SDL_haptic.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\stdlib\SDL_iconv.c"
 				>
 			</File>
@@ -1941,60 +916,6 @@
 			<File
 				RelativePath="..\..\src\events\SDL_keyboard.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\stdlib\SDL_malloc.c"
@@ -2003,183 +924,17 @@
 			<File
 				RelativePath="..\..\src\audio\SDL_mixer.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\audio\SDL_mixer_MMX_VC.c"
-				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\events\SDL_mouse.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\video\dummy\SDL_nullevents.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\video\dummy\SDL_nullmouse.c"
+				RelativePath="..\..\src\video\dummy\SDL_nullrender.c"
 				>
 			</File>
 			<File
@@ -2189,60 +944,10 @@
 			<File
 				RelativePath="..\..\src\video\SDL_pixels.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\power\SDL_power.c"
+				>
 			</File>
 			<File
 				RelativePath="..\..\src\stdlib\SDL_qsort.c"
@@ -2251,292 +956,38 @@
 			<File
 				RelativePath="..\..\src\events\SDL_quit.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\events\SDL_resize.c"
+				RelativePath="..\..\src\video\SDL_rect.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\video\SDL_renderer_sw.c"
+				>
 			</File>
 			<File
 				RelativePath="..\..\src\video\SDL_RLEaccel.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\file\SDL_rwops.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\video\SDL_shape.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\atomic\SDL_spinlock.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\stdlib\SDL_stdlib.c"
+				>
 			</File>
 			<File
 				RelativePath="..\..\src\video\SDL_stretch.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\stdlib\SDL_string.c"
@@ -2545,1000 +996,114 @@
 			<File
 				RelativePath="..\..\src\video\SDL_surface.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\thread\generic\SDL_syscond.c"
+				RelativePath="..\..\src\haptic\dummy\SDL_syshaptic.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\video\wincommon\SDL_sysevents.c"
-				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\joystick\dummy\SDL_sysjoystick.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\loadso\win32\SDL_sysloadso.c"
+				RelativePath="..\..\src\loadso\windows\SDL_sysloadso.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\thread\windows\SDL_sysmutex.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\video\wincommon\SDL_sysmouse.c"
+				RelativePath="..\..\src\power\windows\SDL_syspower.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\thread\win32\SDL_sysmutex.c"
+				RelativePath="..\..\src\thread\windows\SDL_syssem.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\thread\win32\SDL_syssem.c"
+				RelativePath="..\..\src\thread\windows\SDL_systhread.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\thread\win32\SDL_systhread.c"
-				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\timer\wince\SDL_systimer.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\video\wincommon\SDL_syswm.c"
-				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
 				RelativePath="..\..\src\thread\SDL_thread.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\timer\SDL_timer.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\events\SDL_touch.c"
+				>
 			</File>
 			<File
 				RelativePath="..\..\src\video\SDL_video.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\audio\SDL_wave.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\events\SDL_windowevents.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\windows\SDL_windowsclipboard.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\windows\SDL_windowsevents.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\windows\SDL_windowsgamma.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\windows\SDL_windowskeyboard.c"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\video\wincommon\SDL_wingl.c"
+				RelativePath="..\..\src\video\windows\SDL_windowsmodes.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\video\windows\SDL_windowsmouse.c"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\video\SDL_yuv.c"
+				RelativePath="..\..\src\video\windows\SDL_windowsopengl.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\windows\SDL_windowsshape.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\video\windows\SDL_windowsvideo.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\windows\SDL_windowswindow.c"
+				>
 			</File>
 			<File
 				RelativePath="..\..\src\video\SDL_yuv_mmx.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\video\SDL_yuv_sw.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\thread\win32\win_ce_semaphore.c"
+				RelativePath="..\..\src\thread\windows\win_ce_semaphore.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
@@ -3546,27 +1111,19 @@
 			Filter="h;hpp;hxx;hm;inl"
 			>
 			<File
-				RelativePath="..\..\include\begin_code.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\video\blank_cursor.h"
+				RelativePath="..\..\src\events\blank_cursor.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\close_code.h"
+				RelativePath="..\..\src\events\default_cursor.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\video\default_cursor.h"
+				RelativePath="..\..\src\libm\math.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\hermes\HeadMMX.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\hermes\HeadX86.h"
+				RelativePath="..\..\src\libm\math_private.h"
 				>
 			</File>
 			<File
@@ -3574,15 +1131,27 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL.h"
+				RelativePath="..\..\src\events\scancodes_darwin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\events\scancodes_linux.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_active.h"
+				RelativePath="..\..\src\events\scancodes_windows.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_audio.h"
+				RelativePath="..\..\src\events\scancodes_xfree86.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\SDL_alphamult.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\SDL_assert_c.h"
 				>
 			</File>
 			<File
@@ -3602,27 +1171,27 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_byteorder.h"
+				RelativePath="..\..\src\video\SDL_blit_auto.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_config.h"
+				RelativePath="..\..\src\video\SDL_blit_copy.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_config_wince.h"
+				RelativePath="..\..\src\video\SDL_blit_slow.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_copying.h"
+				RelativePath="..\..\src\video\windows\SDL_ceddrawrender.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_cpuinfo.h"
+				RelativePath="..\..\src\events\SDL_clipboardevents_c.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\video\SDL_cursor_c.h"
+				RelativePath="..\..\src\video\windows\SDL_d3drender.h"
 				>
 			</File>
 			<File
@@ -3630,15 +1199,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\video\windib\SDL_dibevents_c.h"
+				RelativePath="..\..\src\audio\disk\SDL_diskaudio.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\video\windib\SDL_dibvideo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\audio\disk\SDL_diskaudio.h"
+				RelativePath="..\..\src\video\SDL_draw.h"
 				>
 			</File>
 			<File
@@ -3646,22 +1211,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_endian.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\SDL_error.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\src\SDL_error_c.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_events.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\src\events\SDL_events_c.h"
 				>
 			</File>
@@ -3670,11 +1223,23 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\video\gapi\sdl_gapivideo.h"
+				RelativePath="..\..\src\video\windows\SDL_gapirender.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\windows\SDL_gapirender_c.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_getenv.h"
+				RelativePath="..\..\src\video\windows\SDL_gdirender.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\events\SDL_gesture_c.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\SDL_glesfuncs.h"
 				>
 			</File>
 			<File
@@ -3682,7 +1247,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_joystick.h"
+				RelativePath="..\..\src\haptic\SDL_haptic_c.h"
 				>
 			</File>
 			<File
@@ -3690,11 +1255,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_keyboard.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\SDL_keysym.h"
+				RelativePath="..\..\src\events\SDL_keyboard_c.h"
 				>
 			</File>
 			<File
@@ -3702,39 +1263,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_loadso.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\video\wincommon\SDL_lowvideo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\SDL_main.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\video\SDL_memops.h"
+				RelativePath="..\..\src\events\SDL_mouse_c.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\audio\SDL_mixer_MMX.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\audio\SDL_mixer_MMX_VC.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\SDL_mouse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\SDL_mutex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\SDL_name.h"
+				RelativePath="..\..\src\video\windows\SDL_msctf.h"
 				>
 			</File>
 			<File
@@ -3742,7 +1275,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\video\dummy\SDL_nullmouse_c.h"
+				RelativePath="..\..\src\video\dummy\SDL_nullrender_c.h"
 				>
 			</File>
 			<File
@@ -3750,19 +1283,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_opengl.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\src\video\SDL_pixels_c.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_platform.h"
+				RelativePath="..\..\src\video\SDL_rect_c.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_quit.h"
+				RelativePath="..\..\src\video\SDL_renderer_sw.h"
 				>
 			</File>
 			<File
@@ -3770,11 +1299,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_rwops.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\video\SDL_stretch_c.h"
+				RelativePath="..\..\src\video\SDL_shape_internals.h"
 				>
 			</File>
 			<File
@@ -3782,27 +1307,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\thread\generic\SDL_syscond_c.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\src\events\SDL_sysevents.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\joystick\SDL_sysjoystick.h"
+				RelativePath="..\..\src\haptic\SDL_syshaptic.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\video\wincommon\SDL_sysmouse_c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\thread\generic\SDL_sysmutex_c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\thread\generic\SDL_syssem_c.h"
+				RelativePath="..\..\src\joystick\SDL_sysjoystick.h"
 				>
 			</File>
 			<File
@@ -3810,11 +1323,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\thread\generic\SDL_systhread_c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\thread\win32\SDL_systhread_c.h"
+				RelativePath="..\..\src\thread\windows\SDL_systhread_c.h"
 				>
 			</File>
 			<File
@@ -3826,43 +1335,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_syswm.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\video\wincommon\SDL_syswm_c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\SDL_thread.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\src\thread\SDL_thread_c.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_timer.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\src\timer\SDL_timer_c.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_types.h"
+				RelativePath="..\..\src\events\SDL_touch_c.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_version.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\SDL_video.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\video\windib\SDL_vkeys.h"
+				RelativePath="..\..\src\video\windows\SDL_vkeys.h"
 				>
 			</File>
 			<File
@@ -3870,7 +1355,47 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\video\wincommon\SDL_wingl_c.h"
+				RelativePath="..\..\src\events\SDL_windowevents_c.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\windows\SDL_windowsclipboard.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\windows\SDL_windowsevents.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\windows\SDL_windowsgamma.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\windows\SDL_windowskeyboard.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\windows\SDL_windowsmodes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\windows\SDL_windowsmouse.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\windows\SDL_windowsopengl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\windows\SDL_windowsshape.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\windows\SDL_windowsvideo.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\video\windows\SDL_windowswindow.h"
 				>
 			</File>
 			<File
@@ -3878,15 +1403,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\video\SDL_yuvfuncs.h"
+				RelativePath="..\..\src\thread\windows\win_ce_semaphore.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\thread\win32\win_ce_semaphore.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\video\wincommon\wmmsg.h"
+				RelativePath="..\..\src\video\windows\wmmsg.h"
 				>
 			</File>
 		</Filter>
--- a/VisualCE/SDLMain/SDLmain.vcproj	Mon Jan 24 15:10:16 2011 -0800
+++ b/VisualCE/SDLMain/SDLmain.vcproj	Mon Jan 24 15:46:11 2011 -0800
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9.00"
 	Name="SDLmain"
 	ProjectGUID="{5AC88B84-5EAA-4C1E-948D-332DA34227F6}"
 	RootNamespace="SDLmain"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -89,6 +90,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -172,6 +176,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -255,6 +262,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -338,6 +348,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -421,6 +434,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -507,6 +523,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -530,62 +549,8 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
-				RelativePath="..\..\src\main\win32\SDL_win32_main.c"
+				RelativePath="..\..\src\main\windows\SDL_windows_main.c"
 				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
--- a/VisualCE/loopwave/loopwave.vcproj	Mon Jan 24 15:10:16 2011 -0800
+++ b/VisualCE/loopwave/loopwave.vcproj	Mon Jan 24 15:46:11 2011 -0800
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9.00"
 	Name="loopwave"
 	ProjectGUID="{6F642636-CB11-4DC7-855E-27FE1744003A}"
 	RootNamespace="loopwave"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -74,6 +75,8 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/loopwave.pdb"
 				SubSystem="0"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -85,6 +88,9 @@
 				Name="VCBscMakeTool"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -125,7 +131,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\nclude"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_WINDOWS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -154,6 +160,8 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/loopwave.pdb"
 				SubSystem="0"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -165,6 +173,9 @@
 				Name="VCBscMakeTool"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -236,6 +247,8 @@
 				SubSystem="0"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -247,6 +260,9 @@
 				Name="VCBscMakeTool"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -317,6 +333,8 @@
 				SubSystem="0"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -328,6 +346,9 @@
 				Name="VCBscMakeTool"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
--- a/VisualCE/testalpha/testalpha.vcproj	Mon Jan 24 15:10:16 2011 -0800
+++ b/VisualCE/testalpha/testalpha.vcproj	Mon Jan 24 15:46:11 2011 -0800
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9.00"
 	Name="testalpha"
 	ProjectGUID="{DF401CB3-6F70-4485-996B-B7C357CF7EE7}"
 	RootNamespace="testalpha"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -94,6 +95,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -107,6 +110,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -195,6 +201,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -208,6 +216,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -300,6 +311,8 @@
 				LinkTimeCodeGeneration="1"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -313,6 +326,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -400,6 +416,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -413,6 +431,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -500,6 +521,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -513,6 +536,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -600,6 +626,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -613,6 +641,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
--- a/VisualCE/testtimer/testtimer.vcproj	Mon Jan 24 15:10:16 2011 -0800
+++ b/VisualCE/testtimer/testtimer.vcproj	Mon Jan 24 15:46:11 2011 -0800
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9.00"
 	Name="testtimer"
 	ProjectGUID="{D482D7EE-6FF0-4254-9027-C59F8F03AB1F}"
 	RootNamespace="testtimer"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -74,6 +75,8 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/testtimer.pdb"
 				SubSystem="0"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -85,6 +88,9 @@
 				Name="VCBscMakeTool"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -125,6 +131,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_WINDOWS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -153,6 +160,8 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/testtimer.pdb"
 				SubSystem="0"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -164,6 +173,9 @@
 				Name="VCBscMakeTool"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -235,6 +247,8 @@
 				SubSystem="0"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -246,6 +260,9 @@
 				Name="VCBscMakeTool"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -286,6 +303,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="2"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_WINDOWS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -315,6 +333,8 @@
 				SubSystem="0"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -326,6 +346,9 @@
 				Name="VCBscMakeTool"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
--- a/VisualCE/testwin/testwin.vcproj	Mon Jan 24 15:10:16 2011 -0800
+++ b/VisualCE/testwin/testwin.vcproj	Mon Jan 24 15:46:11 2011 -0800
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9.00"
 	Name="testwin"
 	ProjectGUID="{DC516978-88CB-4F9A-A39A-C351C258613B}"
 	RootNamespace="testwin"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -93,6 +94,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -106,6 +109,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -194,6 +200,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -207,6 +215,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -295,6 +306,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -308,6 +321,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -395,6 +411,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -408,6 +426,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -495,6 +516,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -508,6 +531,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
@@ -595,6 +621,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -608,6 +636,9 @@
 				OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc"
 			/>
 			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
 				Name="VCCodeSignTool"
 			/>
 			<Tool
--- a/include/SDL_assert.h	Mon Jan 24 15:10:16 2011 -0800
+++ b/include/SDL_assert.h	Mon Jan 24 15:46:11 2011 -0800
@@ -50,7 +50,7 @@
 assert can have unique static variables associated with it.
 */
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(_WIN32_WCE)
 #include <intrin.h>
     #define SDL_TriggerBreakpoint() __debugbreak()
 #elif (defined(__GNUC__) && ((__i386__) || (__x86_64__)))
--- a/include/SDL_atomic.h	Mon Jan 24 15:10:16 2011 -0800
+++ b/include/SDL_atomic.h	Mon Jan 24 15:46:11 2011 -0800
@@ -58,7 +58,7 @@
 
 /* Need to do this here because intrin.h has C++ code in it */
 /* Visual Studio 2005 has a bug where intrin.h conflicts with winnt.h */
-#if defined(_MSC_VER) && (_MSC_VER >= 1500)
+#if defined(_MSC_VER) && (_MSC_VER >= 1500) && !defined(_WIN32_WCE)
 #include <intrin.h>
 #define HAVE_MSC_ATOMICS
 #endif
--- a/include/SDL_compat.h	Mon Jan 24 15:10:16 2011 -0800
+++ b/include/SDL_compat.h	Mon Jan 24 15:46:11 2011 -0800
@@ -65,7 +65,7 @@
 /*@{*/
 
 /* Platform */
-#ifdef __WINDOWS__
+#ifdef __WIN32__
 #undef __WIN32__
 #define __WIN32__   1
 #endif
--- a/include/SDL_config_windows.h	Mon Jan 24 15:10:16 2011 -0800
+++ b/include/SDL_config_windows.h	Mon Jan 24 15:46:11 2011 -0800
@@ -20,8 +20,8 @@
     slouken@libsdl.org
 */
 
-#ifndef _SDL_config_windows2_h
-#define _SDL_config_windows2_h
+#ifndef _SDL_config_windows_h
+#define _SDL_config_windows_h
 
 #include "SDL_platform.h"
 
@@ -178,7 +178,11 @@
 #define SDL_VIDEO_DRIVER_DUMMY	1
 #define SDL_VIDEO_DRIVER_WINDOWS	1
 
+#ifdef _WIN32_WCE
+#define SDL_VIDEO_RENDER_GAPI	1
+#else
 #define SDL_VIDEO_RENDER_D3D	1
+#endif
 #define SDL_VIDEO_RENDER_GDI	1
 
 /* Enable OpenGL support */
@@ -196,4 +200,4 @@
 #define SDL_ASSEMBLY_ROUTINES	1
 #endif
 
-#endif /* _SDL_config_windows2_h */
+#endif /* _SDL_config_windows_h */
--- a/include/SDL_main.h	Mon Jan 24 15:10:16 2011 -0800
+++ b/include/SDL_main.h	Mon Jan 24 15:46:11 2011 -0800
@@ -31,7 +31,7 @@
  *  Redefine main() on some platforms so that it is called by SDL.
  */
 
-#if defined(__WINDOWS__) || \
+#if defined(__WIN32__) || \
     (defined(__MWERKS__) && !defined(__BEOS__)) || \
     defined(__SYMBIAN32__) || defined(__IPHONEOS__) || \
     defined(__ANDROID__)
@@ -66,7 +66,7 @@
 
 
 /* From the SDL library code -- needed for registering the app on Win32 */
-#ifdef __WINDOWS__
+#ifdef __WIN32__
 
 #include "begin_code.h"
 #ifdef __cplusplus
--- a/include/SDL_opengl.h	Mon Jan 24 15:10:16 2011 -0800
+++ b/include/SDL_opengl.h	Mon Jan 24 15:46:11 2011 -0800
@@ -31,7 +31,7 @@
 
 #include "SDL_config.h"
 
-#ifdef __WINDOWS__
+#ifdef __WIN32__
 #define WIN32_LEAN_AND_MEAN
 #ifndef NOMINMAX
 #define NOMINMAX                /* Don't defined min() and max() */
--- a/include/SDL_platform.h	Mon Jan 24 15:10:16 2011 -0800
+++ b/include/SDL_platform.h	Mon Jan 24 15:46:11 2011 -0800
@@ -125,8 +125,8 @@
 #define __SOLARIS__	1
 #endif
 #if defined(WIN32) || defined(_WIN32)
-#undef __WINDOWS__
-#define __WINDOWS__	1
+#undef __WIN32__
+#define __WIN32__	1
 #endif
 
 #if defined(__NDS__)
--- a/include/SDL_rwops.h	Mon Jan 24 15:10:16 2011 -0800
+++ b/include/SDL_rwops.h	Mon Jan 24 15:46:11 2011 -0800
@@ -83,7 +83,7 @@
     Uint32 type;
     union
     {
-#ifdef __WINDOWS__
+#ifdef __WIN32__
         struct
         {
             SDL_bool append;
--- a/include/SDL_thread.h	Mon Jan 24 15:10:16 2011 -0800
+++ b/include/SDL_thread.h	Mon Jan 24 15:46:11 2011 -0800
@@ -55,7 +55,7 @@
  */
 typedef int (SDLCALL * SDL_ThreadFunction) (void *data);
 
-#if defined(__WINDOWS__) && !defined(HAVE_LIBC)
+#if defined(__WIN32__) && !defined(HAVE_LIBC)
 /**
  *  \file SDL_thread.h
  *  
--- a/include/begin_code.h	Mon Jan 24 15:10:16 2011 -0800
+++ b/include/begin_code.h	Mon Jan 24 15:46:11 2011 -0800
@@ -42,7 +42,7 @@
 #  else
 #   define DECLSPEC	__declspec(export)
 #  endif
-# elif defined(__WINDOWS__)
+# elif defined(__WIN32__)
 #  ifdef __BORLANDC__
 #   ifdef BUILD_SDL
 #    define DECLSPEC
@@ -63,7 +63,7 @@
 
 /* By default SDL uses the C calling convention */
 #ifndef SDLCALL
-#if defined(__WINDOWS__) && !defined(__GNUC__)
+#if defined(__WIN32__) && !defined(__GNUC__)
 #define SDLCALL __cdecl
 #else
 #define SDLCALL
--- a/src/SDL.c	Mon Jan 24 15:10:16 2011 -0800
+++ b/src/SDL.c	Mon Jan 24 15:46:11 2011 -0800
@@ -39,7 +39,7 @@
 extern int SDL_TimerInit(void);
 extern void SDL_TimerQuit(void);
 #endif
-#if defined(__WINDOWS__)
+#if defined(__WIN32__)
 extern int SDL_HelperWindowCreate(void);
 extern int SDL_HelperWindowDestroy(void);
 #endif
@@ -147,7 +147,7 @@
     /* Clear the error message */
     SDL_ClearError();
 
-#if defined(__WINDOWS__)
+#if defined(__WIN32__)
     if (SDL_HelperWindowCreate() < 0) {
         return -1;
     }
@@ -220,7 +220,7 @@
     fflush(stdout);
 #endif
 
-#if defined(__WINDOWS__)
+#if defined(__WIN32__)
     SDL_HelperWindowDestroy();
 #endif
     SDL_QuitSubSystem(SDL_INIT_EVERYTHING);
@@ -312,7 +312,7 @@
     return "RISC OS";
 #elif __SOLARIS__
     return "Solaris";
-#elif __WINDOWS__
+#elif __WIN32__
 #ifdef _WIN32_WCE
     return "Windows CE";
 #else
@@ -325,7 +325,7 @@
 #endif
 }
 
-#if defined(__WINDOWS__)
+#if defined(__WIN32__)
 
 #if !defined(HAVE_LIBC) || (defined(__WATCOMC__) && defined(BUILD_DLL))
 /* Need to include DllMain() on Watcom C for some reason.. */
@@ -347,6 +347,6 @@
 }
 #endif /* building DLL with Watcom C */
 
-#endif /* __WINDOWS__ */
+#endif /* __WIN32__ */
 
 /* vi: set ts=4 sw=4 expandtab: */
--- a/src/SDL_assert.c	Mon Jan 24 15:10:16 2011 -0800
+++ b/src/SDL_assert.c	Mon Jan 24 15:46:11 2011 -0800
@@ -26,9 +26,19 @@
 #include "SDL_assert_c.h"
 #include "video/SDL_sysvideo.h"
 
-#ifdef __WINDOWS__
+#ifdef __WIN32__
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+
+#ifndef WS_OVERLAPPEDWINDOW
+#define WS_OVERLAPPEDWINDOW 0
+#endif
+
+#ifdef UNICODE
+#define WIN_UTF8ToString(S) (WCHAR *)SDL_iconv_string("UCS-2", "UTF-8", (char *)S, SDL_strlen(S)+1)
+#else
+#define WIN_UTF8ToString(S) SDL_iconv_string("ASCII", "UTF-8", (char *)S, SDL_strlen(S)+1)
+#endif
 #else  /* fprintf, _exit(), etc. */
 #include <stdio.h>
 #include <stdlib.h>
@@ -57,11 +67,12 @@
 static void
 debug_print(const char *fmt, ...)
 {
-#ifdef __WINDOWS__
+#ifdef __WIN32__
     /* Format into a buffer for OutputDebugStringA(). */
     char buf[1024];
     char *startptr;
     char *ptr;
+    LPTSTR tstr;
     int len;
     va_list ap;
     va_start(ap, fmt);
@@ -78,15 +89,19 @@
     for (ptr = startptr; *ptr; ptr++) {
         if (*ptr == '\n') {
             *ptr = '\0';
-            OutputDebugStringA(startptr);
-            OutputDebugStringA("\r\n");
+            tstr = WIN_UTF8ToString(startptr);
+            OutputDebugString(tstr);
+            SDL_free(tstr);
+            OutputDebugString(TEXT("\r\n"));
             startptr = ptr+1;
         }
     }
 
     /* catch that last piece if it didn't have a newline... */
     if (startptr != ptr) {
-        OutputDebugStringA(startptr);
+        tstr = WIN_UTF8ToString(startptr);
+        OutputDebugString(tstr);
+        SDL_free(tstr);
     }
 #else
     /* Unix has it easy. Just dump it to stderr. */
@@ -99,7 +114,7 @@
 }
 
 
-#ifdef __WINDOWS__
+#ifdef __WIN32__
 static SDL_assert_state SDL_Windows_AssertChoice = SDL_ASSERTION_ABORT;
 static const SDL_assert_data *SDL_Windows_AssertData = NULL;
 
@@ -113,6 +128,7 @@
             /* !!! FIXME: all this code stinks. */
             const SDL_assert_data *data = SDL_Windows_AssertData;
             char buf[1024];
+            LPTSTR tstr;
             const int w = 100;
             const int h = 25;
             const int gap = 10;
@@ -121,14 +137,14 @@
             int len;
             int i;
             static const struct { 
-                const char *name;
+                LPCTSTR name;
                 SDL_assert_state state;
             } buttons[] = {
-                {"Abort", SDL_ASSERTION_ABORT },
-                {"Break", SDL_ASSERTION_BREAK },
-                {"Retry", SDL_ASSERTION_RETRY },
-                {"Ignore", SDL_ASSERTION_IGNORE },
-                {"Always Ignore", SDL_ASSERTION_ALWAYS_IGNORE },
+                {TEXT("Abort"), SDL_ASSERTION_ABORT },
+                {TEXT("Break"), SDL_ASSERTION_BREAK },
+                {TEXT("Retry"), SDL_ASSERTION_RETRY },
+                {TEXT("Ignore"), SDL_ASSERTION_IGNORE },
+                {TEXT("Always Ignore"), SDL_ASSERTION_ALWAYS_IGNORE },
             };
 
             len = (int) SDL_snprintf(buf, sizeof (buf), 
@@ -140,14 +156,16 @@
                 buf[sizeof (buf) - 1] = '\0';
             }
 
-            CreateWindowA("STATIC", buf,
+            tstr = WIN_UTF8ToString(buf);
+            CreateWindow(TEXT("STATIC"), tstr,
                          WS_VISIBLE | WS_CHILD | SS_LEFT,
                          x, y, 550, 100,
                          hwnd, (HMENU) 1, NULL, NULL);
+            SDL_free(tstr);
             y += 110;
 
             for (i = 0; i < (sizeof (buttons) / sizeof (buttons[0])); i++) {
-                CreateWindowA("BUTTON", buttons[i].name,
+                CreateWindow(TEXT("BUTTON"), buttons[i].name,
                          WS_VISIBLE | WS_CHILD,
                          x, y, w, h,
                          hwnd, (HMENU) buttons[i].state, NULL, NULL);
@@ -248,7 +266,7 @@
 
 static void SDL_ExitProcess(int exitcode)
 {
-#ifdef __WINDOWS__
+#ifdef __WIN32__
     ExitProcess(42);
 #else
     _exit(42);
@@ -311,7 +329,7 @@
 
     /* platform-specific UI... */
 
-#ifdef __WINDOWS__
+#ifdef __WIN32__
     state = SDL_PromptAssertion_windows(data);
 
 #elif __MACOSX__
--- a/src/atomic/SDL_spinlock.c	Mon Jan 24 15:10:16 2011 -0800
+++ b/src/atomic/SDL_spinlock.c	Mon Jan 24 15:46:11 2011 -0800
@@ -26,8 +26,13 @@
 
 /* Don't do the check for Visual Studio 2005, it's safe here */
 #if defined(_MSC_VER)
+#ifdef _WIN32_WCE
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#else
 #include <intrin.h>
 #endif
+#endif /* _MSC_VER */
 
 /* This function is where all the magic happens... */
 SDL_bool
--- a/src/audio/SDL_audio.c	Mon Jan 24 15:10:16 2011 -0800
+++ b/src/audio/SDL_audio.c	Mon Jan 24 15:46:11 2011 -0800
@@ -971,7 +971,7 @@
     if (!current_audio.impl.ProvidesOwnCallbackThread) {
         /* Start the audio thread */
 /* !!! FIXME: this is nasty. */
-#if (defined(__WINDOWS__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC)
+#if (defined(__WIN32__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC)
 #undef SDL_CreateThread
         device->thread = SDL_CreateThread(SDL_RunAudio, device, NULL, NULL);
 #else
--- a/src/cpuinfo/SDL_cpuinfo.c	Mon Jan 24 15:10:16 2011 -0800
+++ b/src/cpuinfo/SDL_cpuinfo.c	Mon Jan 24 15:46:11 2011 -0800
@@ -38,7 +38,7 @@
 #include <signal.h>
 #include <setjmp.h>
 #endif
-#ifdef __WINDOWS__
+#ifdef __WIN32__
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif
@@ -319,7 +319,7 @@
             sysctlbyname("hw.ncpu", &SDL_CPUCount, &size, NULL, 0);
         }
 #endif
-#ifdef __WINDOWS__
+#ifdef __WIN32__
         if (SDL_CPUCount <= 0) {
             SYSTEM_INFO info;
             GetSystemInfo(&info);
--- a/src/events/SDL_events.c	Mon Jan 24 15:10:16 2011 -0800
+++ b/src/events/SDL_events.c	Mon Jan 24 15:46:11 2011 -0800
@@ -170,7 +170,7 @@
 
         /* The event thread will handle timers too */
         SDL_SetTimerThreaded(2);
-#if (defined(__WINDOWS__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC)
+#if (defined(__WIN32__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC)
 #undef SDL_CreateThread
         SDL_EventThread =
             SDL_CreateThread(SDL_GobbleEvents, NULL, NULL, NULL);
--- a/src/events/SDL_sysevents.h	Mon Jan 24 15:10:16 2011 -0800
+++ b/src/events/SDL_sysevents.h	Mon Jan 24 15:46:11 2011 -0800
@@ -29,7 +29,7 @@
 #define MUST_THREAD_EVENTS
 #endif
 
-#ifdef __WINDOWS__              /* Windows doesn't allow a separate event thread */
+#ifdef __WIN32__              /* Windows doesn't allow a separate event thread */
 #define CANT_THREAD_EVENTS
 #endif
 
--- a/src/file/SDL_rwops.c	Mon Jan 24 15:10:16 2011 -0800
+++ b/src/file/SDL_rwops.c	Mon Jan 24 15:46:11 2011 -0800
@@ -37,7 +37,7 @@
 #include <fat.h>
 #endif /* __NDS__ */
 
-#ifdef __WINDOWS__
+#ifdef __WIN32__
 
 /* Functions to read/write Win32 API file pointers */
 /* Will not use it on WinCE because stdio is buffered, it means
@@ -295,7 +295,7 @@
     }
     return (0);
 }
-#endif /* __WINDOWS__ */
+#endif /* __WIN32__ */
 
 #ifdef HAVE_STDIO_H
 
@@ -449,7 +449,7 @@
         SDL_SetError("SDL_RWFromFile(): No file or no mode specified");
         return NULL;
     }
-#if defined(__WINDOWS__)
+#if defined(__WIN32__)
     rwops = SDL_AllocRW();
     if (!rwops)
         return NULL;            /* SDL_SetError already setup by SDL_AllocRW() */
--- a/src/libm/math_private.h	Mon Jan 24 15:10:16 2011 -0800
+++ b/src/libm/math_private.h	Mon Jan 24 15:46:11 2011 -0800
@@ -19,7 +19,7 @@
 
 /*#include <endian.h>*/
 #include "SDL_endian.h"
-#include <sys/types.h>
+/*#include <sys/types.h>*/
 
 #define attribute_hidden
 #define libm_hidden_proto(x)
--- a/src/loadso/windows/SDL_sysloadso.c	Mon Jan 24 15:10:16 2011 -0800
+++ b/src/loadso/windows/SDL_sysloadso.c	Mon Jan 24 15:46:11 2011 -0800
@@ -61,7 +61,7 @@
     SDL_free(sofile_t);
     SDL_free(errbuf_t);
 
-#else /*if defined(__WINDOWS__) */
+#else /*if defined(__WIN32__) */
     char errbuf[512];
 
     handle = (void *) LoadLibrary(sofile);
--- a/src/power/windows/SDL_syspower.c	Mon Jan 24 15:10:16 2011 -0800
+++ b/src/power/windows/SDL_syspower.c	Mon Jan 24 15:46:11 2011 -0800
@@ -32,11 +32,20 @@
 SDL_bool
 SDL_GetPowerInfo_Windows(SDL_PowerState * state, int *seconds, int *percent)
 {
+#ifdef _WIN32_WCE
+    SYSTEM_POWER_STATUS_EX status;
+#else
     SYSTEM_POWER_STATUS status;
+#endif
     SDL_bool need_details = SDL_FALSE;
 
     /* This API should exist back to Win95 and Windows CE. */
-    if (!GetSystemPowerStatus(&status)) {
+#ifdef _WIN32_WCE
+    if (!GetSystemPowerStatusEx(&status, FALSE))
+#else
+    if (!GetSystemPowerStatus(&status))
+#endif
+    {
         /* !!! FIXME: push GetLastError() into SDL_GetError() */
         *state = SDL_POWERSTATE_UNKNOWN;
     } else if (status.BatteryFlag == 0xFF) {    /* unknown state */
--- a/src/stdlib/SDL_getenv.c	Mon Jan 24 15:10:16 2011 -0800
+++ b/src/stdlib/SDL_getenv.c	Mon Jan 24 15:46:11 2011 -0800
@@ -25,7 +25,7 @@
 
 #ifndef HAVE_GETENV
 
-#if defined(__WINDOWS__) && !defined(_WIN32_WCE)
+#if defined(__WIN32__) && !defined(_WIN32_WCE)
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -163,7 +163,7 @@
     return value;
 }
 
-#endif /* __WINDOWS__ */
+#endif /* __WIN32__ */
 
 #endif /* !HAVE_GETENV */
 
--- a/src/stdlib/SDL_stdlib.c	Mon Jan 24 15:10:16 2011 -0800
+++ b/src/stdlib/SDL_stdlib.c	Mon Jan 24 15:46:11 2011 -0800
@@ -35,9 +35,7 @@
 __declspec(selectany) int _fltused = 1;
 #endif
 
-#ifdef _WIN64
-
-#else
+#ifdef _M_IX86
 
 void
 __declspec(naked)
--- a/src/thread/windows/SDL_syssem.c	Mon Jan 24 15:10:16 2011 -0800
+++ b/src/thread/windows/SDL_syssem.c	Mon Jan 24 15:46:11 2011 -0800
@@ -39,7 +39,7 @@
 #else
     HANDLE id;
 #endif
-    LONG volatile count;
+    LONG count;
 };
 
 
--- a/src/thread/windows/SDL_systhread.c	Mon Jan 24 15:10:16 2011 -0800
+++ b/src/thread/windows/SDL_systhread.c	Mon Jan 24 15:46:11 2011 -0800
@@ -23,12 +23,10 @@
 
 /* Win32 thread management routines for SDL */
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
 #include "SDL_thread.h"
 #include "../SDL_thread_c.h"
 #include "../SDL_systhread.h"
+#include "SDL_systhread_c.h"
 
 #ifndef SDL_PASSED_BEGINTHREAD_ENDTHREAD
 #ifndef _WIN32_WCE
--- a/src/video/SDL_renderer_gl.c	Mon Jan 24 15:10:16 2011 -0800
+++ b/src/video/SDL_renderer_gl.c	Mon Jan 24 15:46:11 2011 -0800
@@ -1181,7 +1181,7 @@
         }
         data->glEnd();
     } else {
-#if defined(__APPLE__) || defined(__WINDOWS__)
+#if defined(__APPLE__) || defined(__WIN32__)
 #else
         int x1, y1, x2, y2;
 #endif
@@ -1200,7 +1200,7 @@
          * least it would be pixel perfect.
          */
         data->glBegin(GL_POINTS);
-#if defined(__APPLE__) || defined(__WINDOWS__)
+#if defined(__APPLE__) || defined(__WIN32__)
         /* Mac OS X and Windows seem to always leave the second point open */
         data->glVertex2f(0.5f + points[count-1].x, 0.5f + points[count-1].y);
 #else
--- a/src/video/windows/SDL_gapirender.c	Mon Jan 24 15:10:16 2011 -0800
+++ b/src/video/windows/SDL_gapirender.c	Mon Jan 24 15:46:11 2011 -0800
@@ -92,19 +92,19 @@
 //#define DM_DISPLAYORIENTATION 0x00800000L
 //#endif
 
-#define FORMAT_565		1
-#define FORMAT_555		2
-#define FORMAT_OTHER		3
+#define FORMAT_565                1
+#define FORMAT_555                2
+#define FORMAT_OTHER                3
 
-#define GETRAWFRAMEBUFFER	0x00020001
-#define GETGXINFO		0x00020000
+#define GETRAWFRAMEBUFFER        0x00020001
+#define GETGXINFO                0x00020000
 
-#define kfPalette		0x10
-#define kfDirect		0x20
-#define kfDirect555		0x40
-#define kfDirect565		0x80
+#define kfPalette                0x10
+#define kfDirect                0x20
+#define kfDirect555                0x40
+#define kfDirect565                0x80
 
-#define GX_FULLSCREEN		0x01
+#define GX_FULLSCREEN                0x01
 
 enum ScreenOrientation { ORIENTATION_UNKNOWN = -1, ORIENTATION_UP = DMDO_0, ORIENTATION_DOWN = DMDO_180, ORIENTATION_LEFT = DMDO_270, ORIENTATION_RIGHT = DMDO_90 };
 enum ScreenGeometry { GEOMETRY_UNKNOWN, GEOMETRY_PORTRAIT, GEOMETRY_LANDSCAPE, GEOMETRY_SQUARE };
@@ -123,15 +123,15 @@
 // private display data
 typedef struct
 {
-    unsigned char* pixels;	// video memory
-    int format;			// video format
-    FrameBufferInfo fb;		// framebuffer geometry
-    GapiInfo* gapi;		// GAPI module
+    unsigned char* pixels;        // video memory
+    int format;                        // video format
+    FrameBufferInfo fb;                // framebuffer geometry
+    GapiInfo* gapi;                // GAPI module
     int userOrientation;
     int systemOrientation;
     int hardwareGeometry;
-    int flags;			// fb flags
-    float scale;		// scale pointer position
+    int flags;                        // fb flags
+    float scale;                // scale pointer position
     int debug;
 
 } WINCE_RenderData;
@@ -147,110 +147,111 @@
 
 
 // system func
-SDL_Renderer*	WINCE_CreateRenderer(SDL_Window* window, Uint32 flags);
-void		WINCE_DestroyRenderer(SDL_Renderer* renderer);
+SDL_Renderer*        WINCE_CreateRenderer(SDL_Window* window, Uint32 flags);
+void                WINCE_DestroyRenderer(SDL_Renderer* renderer);
 
-int		WINCE_CreateTexture(SDL_Renderer* renderer, SDL_Texture* texture);
-void		WINCE_DestroyTexture(SDL_Renderer* renderer, SDL_Texture* texture);
-int		WINCE_QueryTexturePixels(SDL_Renderer* renderer, SDL_Texture* texture, void** pixels, int* pitch);
-int		WINCE_UpdateTexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* rect, const void* pixels, int pitch);
-int		WINCE_LockTexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* rect, int dirty, void** pixels, int* pitch);
-void		WINCE_UnlockTexture(SDL_Renderer* renderer, SDL_Texture* texture);
+int                WINCE_CreateTexture(SDL_Renderer* renderer, SDL_Texture* texture);
+void                WINCE_DestroyTexture(SDL_Renderer* renderer, SDL_Texture* texture);
+int                WINCE_QueryTexturePixels(SDL_Renderer* renderer, SDL_Texture* texture, void** pixels, int* pitch);
+int                WINCE_UpdateTexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* rect, const void* pixels, int pitch);
+int                WINCE_LockTexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* rect, int dirty, void** pixels, int* pitch);
+void                WINCE_UnlockTexture(SDL_Renderer* renderer, SDL_Texture* texture);
 
-int		WINCE_Available(void);
-void		WINCE_SetupOrientation(WINCE_RenderData* data, int width, int height);
+int                WINCE_Available(void);
+void                WINCE_SetupOrientation(WINCE_RenderData* data, int width, int height);
 
-int		WINCE_RenderCopy(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* srect, const SDL_Rect* drect);
-void		WINCE_ShowWindow(_THIS, SDL_Window* window, int visible);
+int                WINCE_RenderCopy(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* srect, const SDL_Rect* drect);
+void                WINCE_ShowWindow(_THIS, SDL_Window* window, int visible);
 
-void		WINCE_RenderPresent(SDL_Renderer* renderer);
-int		WINCE_RenderDrawPoints(SDL_Renderer* renderer, const SDL_Point* points, int count);
-int		WINCE_RenderDrawLines(SDL_Renderer* renderer, const SDL_Point* points, int count);
-int		WINCE_RenderDrawRects(SDL_Renderer* renderer, const SDL_Rect ** rects, int count);
-int		WINCE_RenderFillRects(SDL_Renderer* renderer, const SDL_Rect** rects, int count);
+void                WINCE_RenderPresent(SDL_Renderer* renderer);
+int                WINCE_RenderDrawPoints(SDL_Renderer* renderer, const SDL_Point* points, int count);
+int                WINCE_RenderDrawLines(SDL_Renderer* renderer, const SDL_Point* points, int count);
+int                WINCE_RenderDrawRects(SDL_Renderer* renderer, const SDL_Rect ** rects, int count);
+int                WINCE_RenderFillRects(SDL_Renderer* renderer, const SDL_Rect** rects, int count);
 
-void		WINCE_PointerCoordinateTransform(SDL_Window* window, POINT* pt);
-void		WINCE_DumpVideoInfo(WINCE_RenderData* data);
-void		WINCE_PortraitTransform(WINCE_RenderData* data, int width, int height);
-void		WINCE_LandscapeTransform(WINCE_RenderData* data, int width, int height);
-void		WINCE_SquareTransform(WINCE_RenderData* data, int width, int height);
-int		WINCE_FixedGeometry(FrameBufferInfo* fb, int bpp, int debug);
-int		WINCE_GetDMOrientation(void);
-int		WINCE_SetDMOrientation(int orientation);
-void		WINCE_UpdateYUVTextureData(SDL_Texture* texture);
+void                WINCE_PointerCoordinateTransform(SDL_Window* window, POINT* pt);
+void                WINCE_DumpVideoInfo(WINCE_RenderData* data);
+void                WINCE_PortraitTransform(WINCE_RenderData* data, int width, int height);
+void                WINCE_LandscapeTransform(WINCE_RenderData* data, int width, int height);
+void                WINCE_SquareTransform(WINCE_RenderData* data, int width, int height);
+int                WINCE_FixedGeometry(FrameBufferInfo* fb, int bpp, int debug);
+int                WINCE_GetDMOrientation(void);
+int                WINCE_SetDMOrientation(int orientation);
+void                WINCE_UpdateYUVTextureData(SDL_Texture* texture);
 
 // gapi engine specific
-int		GAPI_Init(WINCE_RenderData* data, HWND hwnd);
-void		GAPI_Quit(WINCE_RenderData* data);
+int                GAPI_Init(WINCE_RenderData* data, HWND hwnd);
+void                GAPI_Quit(WINCE_RenderData* data);
 
 // raw engine specific
-int		RAW_Init(WINCE_RenderData* data);
-void		RAW_Quit(WINCE_RenderData* data);
+int                RAW_Init(WINCE_RenderData* data);
+void                RAW_Quit(WINCE_RenderData* data);
 
 // tools
-void		FrameBufferRotate(FrameBufferInfo* src, int orientation);
-int		GetFrameBufferOrientation(const FrameBufferInfo* src);
-void		PointerRotate(POINT* pt, const FrameBufferInfo* fb, int orientation);
-void		FrameBufferInitialize(FrameBufferInfo* fb);
-void		FrameBufferDumpInfo(const FrameBufferInfo* fb, const char*);
-const		char* GetOrientationName(int orientation);
-void		UpdateLine16to16(const FrameBufferInfo* fb, const Uint16* src, Uint16* dst, Uint16 width);
+void                FrameBufferRotate(FrameBufferInfo* src, int orientation);
+int                GetFrameBufferOrientation(const FrameBufferInfo* src);
+void                PointerRotate(POINT* pt, const FrameBufferInfo* fb, int orientation);
+void                FrameBufferInitialize(FrameBufferInfo* fb);
+void                FrameBufferDumpInfo(const FrameBufferInfo* fb, const char*);
+const                char* GetOrientationName(int orientation);
+void                UpdateLine16to16(const FrameBufferInfo* fb, const Uint16* src, Uint16* dst, Uint16 width);
 
 // stdlib
-inline int	__abs(int x){ return x < 0 ? -x : x; };
-inline void	__swap(int* a, int* b){ int t = *a; *a = *b; *b = t; };
+static __inline__ int        __abs(int x){ return x < 0 ? -x : x; };
+static __inline__ void        __swap(int* a, int* b){ int t = *a; *a = *b; *b = t; };
 
-#define GAPI_RENDER_NAME	"gapi"
-#define RAW_RENDER_NAME		"raw"
+#define GAPI_RENDER_NAME        "gapi"
+#define RAW_RENDER_NAME                "raw"
 //
 SDL_RenderDriver GAPI_RenderDriver = {
     WINCE_CreateRenderer,
     {
-	GAPI_RENDER_NAME,
-	(SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTDISCARD),
-	(SDL_TEXTUREMODULATE_NONE),
-	(SDL_BLENDMODE_NONE),
-	(SDL_SCALEMODE_NONE),
-	7,
-	{
-	    SDL_PIXELFORMAT_RGB555,
-	    SDL_PIXELFORMAT_RGB565,
-	    SDL_PIXELFORMAT_YV12,
-	    SDL_PIXELFORMAT_IYUV,
-	    SDL_PIXELFORMAT_YUY2,
-	    SDL_PIXELFORMAT_UYVY,
-	    SDL_PIXELFORMAT_YVYU
-	},
-	0,
-	0
+        GAPI_RENDER_NAME,
+        (SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTDISCARD),
+        (SDL_TEXTUREMODULATE_NONE),
+        (SDL_BLENDMODE_NONE),
+        (SDL_SCALEMODE_NONE),
+        7,
+        {
+            SDL_PIXELFORMAT_RGB555,
+            SDL_PIXELFORMAT_RGB565,
+            SDL_PIXELFORMAT_YV12,
+            SDL_PIXELFORMAT_IYUV,
+            SDL_PIXELFORMAT_YUY2,
+            SDL_PIXELFORMAT_UYVY,
+            SDL_PIXELFORMAT_YVYU
+        },
+        0,
+        0
     }
 };
 
 SDL_RenderDriver RAW_RenderDriver = {
     WINCE_CreateRenderer,
     {
-	RAW_RENDER_NAME,
-	(SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTDISCARD),
-	(SDL_TEXTUREMODULATE_NONE),
-	(SDL_BLENDMODE_NONE),
-	(SDL_SCALEMODE_NONE),
-	7,
-	{
-	    SDL_PIXELFORMAT_RGB555,
-	    SDL_PIXELFORMAT_RGB565,
-	    SDL_PIXELFORMAT_YV12,
-	    SDL_PIXELFORMAT_IYUV,
-	    SDL_PIXELFORMAT_YUY2,
-	    SDL_PIXELFORMAT_UYVY,
-	    SDL_PIXELFORMAT_YVYU
-	},
-	0,
-	0
+        RAW_RENDER_NAME,
+        (SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTDISCARD),
+        (SDL_TEXTUREMODULATE_NONE),
+        (SDL_BLENDMODE_NONE),
+        (SDL_SCALEMODE_NONE),
+        7,
+        {
+            SDL_PIXELFORMAT_RGB555,
+            SDL_PIXELFORMAT_RGB565,
+            SDL_PIXELFORMAT_YV12,
+            SDL_PIXELFORMAT_IYUV,
+            SDL_PIXELFORMAT_YUY2,
+            SDL_PIXELFORMAT_UYVY,
+            SDL_PIXELFORMAT_YVYU
+        },
+        0,
+        0
     }
 };
 
 int WINCE_Available(void)
 {
+    HMODULE render_gapi;
     const char* preferably = SDL_getenv("SDL_VIDEO_RENDERER");
 
     // raw check
@@ -260,13 +261,13 @@
     ReleaseDC(NULL, hdc);
 
     if(render_raw != 0 && rfbi.cxPixels != 0 && rfbi.cyPixels != 0 &&
-        rfbi.pFramePointer != 0 && rfbi.cxStride != 0 && rfbi.cyStride != 0)
-	    render_raw = 1;
+       rfbi.pFramePointer != 0 && rfbi.cxStride != 0 && rfbi.cyStride != 0)
+        render_raw = 1;
 
     if(preferably && 0 == SDL_strcasecmp(preferably, RAW_RENDER_NAME)) return 0 != render_raw;
 
     // gapi check
-    HMODULE render_gapi = LoadLibrary(TEXT("\\Windows\\gx.dll"));
+    render_gapi = LoadLibrary(TEXT("\\Windows\\gx.dll"));
     if(0 == render_gapi)
         render_gapi = LoadLibrary(TEXT("gx.dll"));
     FreeLibrary(render_gapi);
@@ -290,8 +291,8 @@
     ReleaseDC(NULL, hdc);
 
     if(render_raw != 0 && rfbi.cxPixels != 0 && rfbi.cyPixels != 0 &&
-    	rfbi.pFramePointer != 0 && rfbi.cxStride != 0 && rfbi.cyStride != 0)
-	    render_raw = 1;
+            rfbi.pFramePointer != 0 && rfbi.cxStride != 0 && rfbi.cyStride != 0)
+            render_raw = 1;
 
     // gapi check
     render_gapi = LoadLibrary(TEXT("\\Windows\\gx.dll"));
@@ -299,25 +300,25 @@
         render_gapi = LoadLibrary(TEXT("gx.dll"));
 
     if(render_gapi)
-	FreeLibrary(render_gapi);
+        FreeLibrary(render_gapi);
 
     for(ii = 0; ii < _this->num_displays; ++ii)
     {
-	if(preferably)
-	{
-	    if(0 == SDL_strcasecmp(preferably, RAW_RENDER_NAME) && render_raw)
-    		SDL_AddRenderDriver(&_this->displays[ii], &RAW_RenderDriver);
-	    else
-	    if(0 == SDL_strcasecmp(preferably, GAPI_RENDER_NAME) && render_gapi)
-    		SDL_AddRenderDriver(&_this->displays[ii], &GAPI_RenderDriver);
-	}
-	else
-	{
-	    if(render_raw)
-    		SDL_AddRenderDriver(&_this->displays[ii], &RAW_RenderDriver);
-	    if(render_gapi)
-    		SDL_AddRenderDriver(&_this->displays[ii], &GAPI_RenderDriver);
-	}
+        if(preferably)
+        {
+            if(0 == SDL_strcasecmp(preferably, RAW_RENDER_NAME) && render_raw)
+                SDL_AddRenderDriver(&_this->displays[ii], &RAW_RenderDriver);
+            else
+            if(0 == SDL_strcasecmp(preferably, GAPI_RENDER_NAME) && render_gapi)
+                SDL_AddRenderDriver(&_this->displays[ii], &GAPI_RenderDriver);
+        }
+        else
+        {
+            if(render_raw)
+                SDL_AddRenderDriver(&_this->displays[ii], &RAW_RenderDriver);
+            if(render_gapi)
+                SDL_AddRenderDriver(&_this->displays[ii], &GAPI_RenderDriver);
+        }
     }
 }
 
@@ -332,7 +333,7 @@
     Uint32 Rmask, Gmask, Bmask, Amask;
 
     if(!(window->flags & SDL_WINDOW_FULLSCREEN))
-	window->flags |= SDL_WINDOW_FULLSCREEN;
+        window->flags |= SDL_WINDOW_FULLSCREEN;
 
     if(!SDL_PixelFormatEnumToMasks(displayMode->format, &bpp, &Rmask, &Gmask, &Bmask, &Amask))
     {
@@ -342,13 +343,13 @@
 
     switch(window->fullscreen_mode.format)
     {
-	case SDL_PIXELFORMAT_RGB555:
-	case SDL_PIXELFORMAT_RGB565:
-	    break;
+        case SDL_PIXELFORMAT_RGB555:
+        case SDL_PIXELFORMAT_RGB565:
+            break;
 
-	default:
-    	    SDL_SetError("Support only 16 or 15 bpp");
-	    return NULL;
+        default:
+            SDL_SetError("Support only 16 or 15 bpp");
+            return NULL;
     }
 
     renderer = (SDL_Renderer*) SDL_calloc(1, sizeof(SDL_Renderer));
@@ -375,9 +376,9 @@
 
 
     // set debug
-    data->debug	= SDL_getenv("DEBUG_VIDEO_GAPI") || SDL_getenv("GAPI_RENDERER_DEBUG") ? 1 : 0;
+    data->debug        = SDL_getenv("DEBUG_VIDEO_GAPI") || SDL_getenv("GAPI_RENDERER_DEBUG") ? 1 : 0;
 #if defined(DEBUG_VIDEO_GAPI) || defined(GAPI_RENDERER_DEBUG)
-    data->debug	= 1;
+    data->debug        = 1;
 #endif
 
     windowdata->videodata->render = data->gapi ? RENDER_GAPI : RENDER_RAW;
@@ -418,10 +419,10 @@
 
     if(renderdata)
     {
-	if(renderdata->gapi)
-    	    GAPI_Quit(renderdata);
-	else
-	    RAW_Quit(renderdata);
+        if(renderdata->gapi)
+            GAPI_Quit(renderdata);
+        else
+            RAW_Quit(renderdata);
 
         SDL_free(renderdata);
     }
@@ -448,20 +449,21 @@
 
     if(SDL_ISPIXELFORMAT_FOURCC(texture->format))
     {
-	texturedata->yuv = SDL_SW_CreateYUVTexture(texture->format, texture->w, texture->h);
+        SDL_Window* window = renderer->window;
+        SDL_VideoDisplay* display = window->display;
+
+        texturedata->yuv = SDL_SW_CreateYUVTexture(texture->format, texture->w, texture->h);
         if(NULL == texturedata->yuv)
-	{
-    	    SDL_OutOfMemory();
+        {
+            SDL_OutOfMemory();
             return -1;
         }
-	SDL_Window* window = renderer->window;
-	SDL_VideoDisplay* display = window->display;
-	texturedata->format = display->current_mode.format;
+        texturedata->format = display->current_mode.format;
     }
     else
     {
-	texturedata->yuv = NULL;
-	texturedata->format = texture->format;
+        texturedata->yuv = NULL;
+        texturedata->format = texture->format;
     }
 
     texture->driverdata = texturedata;
@@ -475,10 +477,10 @@
 
     if(texturedata)
     {
-	if(texturedata->yuv) SDL_SW_DestroyYUVTexture(texturedata->yuv);
-	if(texturedata->pixels) SDL_free(texturedata->pixels);
-	SDL_free(texturedata);
-	texture->driverdata = NULL;
+        if(texturedata->yuv) SDL_SW_DestroyYUVTexture(texturedata->yuv);
+        if(texturedata->pixels) SDL_free(texturedata->pixels);
+        SDL_free(texturedata);
+        texture->driverdata = NULL;
     }
 }
 
@@ -509,19 +511,19 @@
 
     if(0 < rect->w && 0 < rect->h)
     {
-	const unsigned char *src = ((const unsigned char*) pixels);
-	unsigned char *dst = ((unsigned char*) texturedata->pixels) +
-				rect->y * texturedata->pitch +
-				rect->x * SDL_BYTESPERPIXEL(texture->format);
+        const unsigned char *src = ((const unsigned char*) pixels);
+        unsigned char *dst = ((unsigned char*) texturedata->pixels) +
+                                rect->y * texturedata->pitch +
+                                rect->x * SDL_BYTESPERPIXEL(texture->format);
         int length = rect->w * SDL_BYTESPERPIXEL(texture->format);
-	int height = rect->h;
+        int height = rect->h;
 
-	while(height--)
-	{
-	    SDL_memcpy(dst, src, length);
-	    dst += texturedata->pitch;
-	    src += pitch;
-	}
+        while(height--)
+        {
+            SDL_memcpy(dst, src, length);
+            dst += texturedata->pitch;
+            src += pitch;
+        }
     }
 
     return 0;
@@ -535,9 +537,10 @@
         return SDL_SW_LockYUVTexture(texturedata->yuv, rect, dirty, pixels, pitch);
 
     *pixels = (void *) ((unsigned char*) texturedata->pixels +
-		    rect->y * texturedata->pitch +
-		    rect->x * SDL_BYTESPERPIXEL(texture->format));
+                    rect->y * texturedata->pitch +
+                    rect->x * SDL_BYTESPERPIXEL(texture->format));
     *pitch = texturedata->pitch;
+    return 0;
 }
 
 void WINCE_UnlockTexture(SDL_Renderer* renderer, SDL_Texture* texture)
@@ -547,7 +550,7 @@
     if(texturedata->yuv)
     {
         SDL_SW_UnlockYUVTexture(texturedata->yuv);
-	WINCE_UpdateYUVTextureData(texture);
+        WINCE_UpdateYUVTextureData(texture);
     }
 }
 
@@ -555,41 +558,43 @@
 {
     WINCE_RenderData* dstdata = (WINCE_RenderData*) renderer->driverdata;
     WINCE_TextureData* srcdata = (WINCE_TextureData*) texture->driverdata;
+    const unsigned char *src;
+    unsigned char *dst;
 
     if((dstdata->flags & FB_SUSPENDED) ||
-       0 >= srect->w || 0 >= srect->h) return;
+       0 >= srect->w || 0 >= srect->h) return 0;
 
     // lock gapi
     if(dstdata->gapi) dstdata->gapi->GXBeginDraw();
 
-    const unsigned char *src = ((const unsigned char*) srcdata->pixels);
-    unsigned char *dst = dstdata->pixels + (dstdata->flags & FB_SKIP_OFFSET ? 0 : dstdata->fb.offset) +
-				drect->y * dstdata->fb.ypitch +
-				drect->x * dstdata->fb.xpitch;
+    src = ((const unsigned char*) srcdata->pixels);
+    dst = dstdata->pixels + (dstdata->flags & FB_SKIP_OFFSET ? 0 : dstdata->fb.offset) +
+                                drect->y * dstdata->fb.ypitch +
+                                drect->x * dstdata->fb.xpitch;
     if(srcdata->yuv)
     {
-	return SDL_SW_CopyYUVToRGB(srcdata->yuv,
+        return SDL_SW_CopyYUVToRGB(srcdata->yuv,
                                    srect, srcdata->format,
                                    drect->w, drect->h, dst,
                                    dstdata->fb.ypitch);
     }
     else
     {
-	int height = drect->h;
-	int length = drect->w * SDL_BYTESPERPIXEL(texture->format); // in bytes
+        int height = drect->h;
+        int length = drect->w * SDL_BYTESPERPIXEL(texture->format); // in bytes
 
-	while(height--)
-	{
-	    switch(SDL_BYTESPERPIXEL(texture->format))
-	    {
-		case 2: UpdateLine16to16(&dstdata->fb, (Uint16*) src, (Uint16*) dst, length >> 1); break;
+        while(height--)
+        {
+            switch(SDL_BYTESPERPIXEL(texture->format))
+            {
+                case 2: UpdateLine16to16(&dstdata->fb, (Uint16*) src, (Uint16*) dst, length >> 1); break;
 
-		default: break;
-	    }
+                default: break;
+            }
 
-	    dst += dstdata->fb.ypitch;
-	    src += srcdata->pitch;
-	}
+            dst += dstdata->fb.ypitch;
+            src += srcdata->pitch;
+        }
     }
 
     // unlock gapi
@@ -630,8 +635,8 @@
 
 void WINCE_SetupOrientation(WINCE_RenderData* data, int width, int height)
 {
-    const float maxW1 = GetSystemMetrics(SM_CXSCREEN) > GetSystemMetrics(SM_CYSCREEN) ? GetSystemMetrics(SM_CXSCREEN) : GetSystemMetrics(SM_CYSCREEN);
-    const float maxW2 = data->fb.width > data->fb.height ? data->fb.width : data->fb.height;
+    const float maxW1 = (float)(GetSystemMetrics(SM_CXSCREEN) > GetSystemMetrics(SM_CYSCREEN) ? GetSystemMetrics(SM_CXSCREEN) : GetSystemMetrics(SM_CYSCREEN));
+    const float maxW2 = (float)(data->fb.width > data->fb.height ? data->fb.width : data->fb.height);
 
     // scale define
     data->scale = maxW2 / maxW1;
@@ -643,31 +648,31 @@
     data->userOrientation = ORIENTATION_UP;
     data->systemOrientation = WINCE_GetDMOrientation();
     data->hardwareGeometry = data->fb.width == data->fb.height ? GEOMETRY_SQUARE :
-				(data->fb.width < data->fb.height ? GEOMETRY_PORTRAIT : GEOMETRY_LANDSCAPE);
+                                (data->fb.width < data->fb.height ? GEOMETRY_PORTRAIT : GEOMETRY_LANDSCAPE);
 
     if(data->debug)
-	WINCE_DumpVideoInfo(data);
+        WINCE_DumpVideoInfo(data);
 
     if(data->systemOrientation == ORIENTATION_UNKNOWN)
-	data->systemOrientation == ORIENTATION_UP;
+        data->systemOrientation = ORIENTATION_UP;
 
     data->userOrientation = ORIENTATION_UP;
 
     switch(data->hardwareGeometry)
     {
-	case GEOMETRY_PORTRAIT:  WINCE_PortraitTransform(data, width, height); break;
-	case GEOMETRY_LANDSCAPE: WINCE_LandscapeTransform(data, width, height); break;
-	case GEOMETRY_SQUARE:    WINCE_SquareTransform(data, width, height); break;
-	default: break;
+        case GEOMETRY_PORTRAIT:  WINCE_PortraitTransform(data, width, height); break;
+        case GEOMETRY_LANDSCAPE: WINCE_LandscapeTransform(data, width, height); break;
+        case GEOMETRY_SQUARE:    WINCE_SquareTransform(data, width, height); break;
+        default: break;
     }
 
     // debug
     if(data->debug)
     {
-	printf("\n");
-	printf("user video width:          %d\n", width);
-	printf("user video height:         %d\n", height);
-	FrameBufferDumpInfo(&data->fb, "user");
+        printf("\n");
+        printf("user video width:          %d\n", width);
+        printf("user video height:         %d\n", height);
+        FrameBufferDumpInfo(&data->fb, "user");
     }
 }
 
@@ -705,42 +710,42 @@
 
     if(visible)
     {
-	if(window->flags & SDL_WINDOW_FULLSCREEN)
-	{
-	    if(videodata->SHFullScreen)
-		videodata->SHFullScreen(windowdata->hwnd, SHFS_HIDETASKBAR | SHFS_HIDESTARTICON | SHFS_HIDESIPBUTTON);
-	    ShowWindow(FindWindow(TEXT("HHTaskBar"), NULL), SW_HIDE);
-	}
+        if(window->flags & SDL_WINDOW_FULLSCREEN)
+        {
+            if(videodata->SHFullScreen)
+                videodata->SHFullScreen(windowdata->hwnd, SHFS_HIDETASKBAR | SHFS_HIDESTARTICON | SHFS_HIDESIPBUTTON);
+            ShowWindow(FindWindow(TEXT("HHTaskBar"), NULL), SW_HIDE);
+        }
 
-	ShowWindow(windowdata->hwnd, SW_SHOW);
+        ShowWindow(windowdata->hwnd, SW_SHOW);
         SetForegroundWindow(windowdata->hwnd);
 
-	if(renderer &&
-	    (videodata->render == RENDER_GAPI || videodata->render == RENDER_RAW))
-	{
-	    WINCE_RenderData* renderdata = (WINCE_RenderData*) renderer->driverdata;
-	    renderdata->flags &= ~FB_SUSPENDED;
-	    if(renderdata->gapi) renderdata->gapi->GXResume();
-	}
+        if(renderer &&
+            (videodata->render == RENDER_GAPI || videodata->render == RENDER_RAW))
+        {
+            WINCE_RenderData* renderdata = (WINCE_RenderData*) renderer->driverdata;
+            renderdata->flags &= ~FB_SUSPENDED;
+            if(renderdata->gapi) renderdata->gapi->GXResume();
+        }
     }
     else
     {
-	if(renderer &&
-	    (videodata->render == RENDER_GAPI || videodata->render == RENDER_RAW))
-	{
-	    WINCE_RenderData* renderdata = (WINCE_RenderData*) renderer->driverdata;
-	    if(renderdata->gapi) renderdata->gapi->GXSuspend();
-	    renderdata->flags |= FB_SUSPENDED;
-	}
+        if(renderer &&
+            (videodata->render == RENDER_GAPI || videodata->render == RENDER_RAW))
+        {
+            WINCE_RenderData* renderdata = (WINCE_RenderData*) renderer->driverdata;
+            if(renderdata->gapi) renderdata->gapi->GXSuspend();
+            renderdata->flags |= FB_SUSPENDED;
+        }
 
-	ShowWindow(windowdata->hwnd, SW_HIDE);
+        ShowWindow(windowdata->hwnd, SW_HIDE);
 
-	if(window->flags & SDL_WINDOW_FULLSCREEN)
-	{
-	    if(videodata->SHFullScreen)
-		videodata->SHFullScreen(windowdata->hwnd, SHFS_SHOWTASKBAR | SHFS_SHOWSTARTICON | SHFS_SHOWSIPBUTTON);
-	    ShowWindow(FindWindow(TEXT("HHTaskBar"), NULL), SW_SHOW);
-	}
+        if(window->flags & SDL_WINDOW_FULLSCREEN)
+        {
+            if(videodata->SHFullScreen)
+                videodata->SHFullScreen(windowdata->hwnd, SHFS_SHOWTASKBAR | SHFS_SHOWSTARTICON | SHFS_SHOWSIPBUTTON);
+            ShowWindow(FindWindow(TEXT("HHTaskBar"), NULL), SW_SHOW);
+        }
     }
 }
 
@@ -749,8 +754,8 @@
 {
     WINCE_RenderData* data = (WINCE_RenderData*) window->renderer->driverdata;
 
-    pt->x *= data->scale;
-    pt->y *= data->scale;
+    pt->x = (LONG)(pt->x * data->scale);
+    pt->y = (LONG)(pt->y * data->scale);
 
     PointerRotate(pt, &data->fb, data->userOrientation);
 }
@@ -758,44 +763,45 @@
 void WINCE_PortraitTransform(WINCE_RenderData* data, int width, int height)
 {
     if(data->systemOrientation != ORIENTATION_UP)
-	FrameBufferRotate(&data->fb, data->systemOrientation);
+        FrameBufferRotate(&data->fb, data->systemOrientation);
 
-    if(data->fb.width != width || data->fb.height != height)
-    switch(data->systemOrientation)
-    {
-	case ORIENTATION_UP:
-	case ORIENTATION_LEFT: data->userOrientation = ORIENTATION_RIGHT; break;
-	case ORIENTATION_RIGHT:
-	case ORIENTATION_DOWN: data->userOrientation = ORIENTATION_LEFT; break;
-	default: break;
+    if(data->fb.width != width || data->fb.height != height) {
+        switch(data->systemOrientation)
+        {
+            case ORIENTATION_UP:
+            case ORIENTATION_LEFT: data->userOrientation = ORIENTATION_RIGHT; break;
+            case ORIENTATION_RIGHT:
+            case ORIENTATION_DOWN: data->userOrientation = ORIENTATION_LEFT; break;
+            default: break;
+        }
     }
 
     if(data->userOrientation != ORIENTATION_UP)
-	FrameBufferRotate(&data->fb, data->userOrientation);
+        FrameBufferRotate(&data->fb, data->userOrientation);
 }
 
 void WINCE_LandscapeTransform(WINCE_RenderData* data, int width, int height)
 {
     switch(data->systemOrientation)
     {
-	case ORIENTATION_UP:  FrameBufferRotate(&data->fb, ORIENTATION_LEFT); break;
-	case ORIENTATION_LEFT:FrameBufferRotate(&data->fb, ORIENTATION_DOWN); break;
-	case ORIENTATION_DOWN:FrameBufferRotate(&data->fb, ORIENTATION_RIGHT); break;
-	default: break;
+        case ORIENTATION_UP:  FrameBufferRotate(&data->fb, ORIENTATION_LEFT); break;
+        case ORIENTATION_LEFT:FrameBufferRotate(&data->fb, ORIENTATION_DOWN); break;
+        case ORIENTATION_DOWN:FrameBufferRotate(&data->fb, ORIENTATION_RIGHT); break;
+        default: break;
     }
 
     if(data->fb.width != width || data->fb.height != height)
     switch(data->systemOrientation)
     {
-	case ORIENTATION_UP:
-	case ORIENTATION_LEFT: data->userOrientation = ORIENTATION_RIGHT; break;
-	case ORIENTATION_RIGHT:
-	case ORIENTATION_DOWN: data->userOrientation = ORIENTATION_LEFT; break;
-	default: break;
+        case ORIENTATION_UP:
+        case ORIENTATION_LEFT: data->userOrientation = ORIENTATION_RIGHT; break;
+        case ORIENTATION_RIGHT:
+        case ORIENTATION_DOWN: data->userOrientation = ORIENTATION_LEFT; break;
+        default: break;
     }
 
     if(data->userOrientation != ORIENTATION_UP)
-	FrameBufferRotate(&data->fb, data->userOrientation);
+        FrameBufferRotate(&data->fb, data->userOrientation);
 }
 
 void WINCE_SquareTransform(WINCE_RenderData* data, int width, int height)
@@ -807,43 +813,43 @@
 {
     // check square
     if(GetSystemMetrics(SM_CXSCREEN) == GetSystemMetrics(SM_CYSCREEN) &&
-	fb->width != fb->height)
+        fb->width != fb->height)
     {
-	if(fb->width < fb->height)
-	    fb->height = fb->width;
-	else
-	if(fb->height < fb->width)
-	    fb->width = fb->height;
+        if(fb->width < fb->height)
+            fb->height = fb->width;
+        else
+        if(fb->height < fb->width)
+            fb->width = fb->height;
     }
 
     // check width
     if(__abs(fb->xpitch) == bpp &&
-	fb->width  != __abs(fb->ypitch) / bpp)
+        fb->width  != __abs(fb->ypitch) / bpp)
     {
-	if(fb->height == __abs(fb->ypitch) / bpp)
-    	{
-	    __swap(&fb->width, &fb->height);
+        if(fb->height == __abs(fb->ypitch) / bpp)
+            {
+            __swap(&fb->width, &fb->height);
 
-	    if(debug)
-		printf("WINCE_FixedGeometry: width: %d, height: %d\n", fb->width, fb->height);
-	}
-	else
-	    return -1;
+            if(debug)
+                printf("WINCE_FixedGeometry: width: %d, height: %d\n", fb->width, fb->height);
+        }
+        else
+            return -1;
     }
     else
     // check height
     if(__abs(fb->ypitch) == bpp &&
-	fb->height != __abs(fb->xpitch) / bpp)
+        fb->height != __abs(fb->xpitch) / bpp)
     {
-	if(fb->width  == __abs(fb->xpitch) / bpp)
-    	{
-	    __swap(&fb->width, &fb->height);
+        if(fb->width  == __abs(fb->xpitch) / bpp)
+            {
+            __swap(&fb->width, &fb->height);
 
-	    if(debug)
-		printf("WINCE_FixedGeometry: width: %d, height: %d\n", fb->width, fb->height);
-	}
-	else
-	    return -1;
+            if(debug)
+                printf("WINCE_FixedGeometry: width: %d, height: %d\n", fb->width, fb->height);
+        }
+        else
+            return -1;
     }
 
     return 0;
@@ -865,8 +871,12 @@
 {
     if(NULL == data->gapi)
     {
-	const char* preferably = SDL_getenv("SDL_VIDEO_RENDERER");
-	if(preferably && 0 != SDL_strcasecmp(preferably, GAPI_RENDER_NAME)) return 0;
+        struct GXDisplayProperties gxProperties;
+        GXDeviceInfo gxInfo = { 0 };
+        HDC hdc;
+        int enable, result;
+        const char* preferably = SDL_getenv("SDL_VIDEO_RENDERER");
+        if(preferably && 0 != SDL_strcasecmp(preferably, GAPI_RENDER_NAME)) return 0;
 
         data->gapi = (GapiInfo *) SDL_calloc(1, sizeof(GapiInfo));
         if(NULL == data->gapi)
@@ -875,116 +885,116 @@
             return 0;
         }
 
-	data->gapi->hGapiLib = LoadLibrary(TEXT("\\Windows\\gx.dll"));
-	if(0 == data->gapi->hGapiLib)
-	{
-	    data->gapi->hGapiLib = LoadLibrary(TEXT("gx.dll"));
-	    if(0 == data->gapi->hGapiLib) return 0;
-	}
+        data->gapi->hGapiLib = LoadLibrary(TEXT("\\Windows\\gx.dll"));
+        if(0 == data->gapi->hGapiLib)
+        {
+            data->gapi->hGapiLib = LoadLibrary(TEXT("gx.dll"));
+            if(0 == data->gapi->hGapiLib) return 0;
+        }
 
-	// load gapi library
+        // load gapi library
 #define LINK(type,name,import) name=(PFN##type)GetProcAddress(data->gapi->hGapiLib,TEXT(import))
-	LINK(GXOpenDisplay,         data->gapi->GXOpenDisplay,         "?GXOpenDisplay@@YAHPAUHWND__@@K@Z");
-	LINK(GXCloseDisplay,        data->gapi->GXCloseDisplay,        "?GXCloseDisplay@@YAHXZ");
-	LINK(GXBeginDraw,           data->gapi->GXBeginDraw,           "?GXBeginDraw@@YAPAXXZ");
-	LINK(GXEndDraw,             data->gapi->GXEndDraw,             "?GXEndDraw@@YAHXZ");
-	LINK(GXGetDisplayProperties,data->gapi->GXGetDisplayProperties,"?GXGetDisplayProperties@@YA?AUGXDisplayProperties@@XZ");
-	LINK(GXSuspend,             data->gapi->GXSuspend,             "?GXSuspend@@YAHXZ");
-	LINK(GXResume,              data->gapi->GXResume,              "?GXResume@@YAHXZ");
+        LINK(GXOpenDisplay,         data->gapi->GXOpenDisplay,         "?GXOpenDisplay@@YAHPAUHWND__@@K@Z");
+        LINK(GXCloseDisplay,        data->gapi->GXCloseDisplay,        "?GXCloseDisplay@@YAHXZ");
+        LINK(GXBeginDraw,           data->gapi->GXBeginDraw,           "?GXBeginDraw@@YAPAXXZ");
+        LINK(GXEndDraw,             data->gapi->GXEndDraw,             "?GXEndDraw@@YAHXZ");
+        LINK(GXGetDisplayProperties,data->gapi->GXGetDisplayProperties,"?GXGetDisplayProperties@@YA?AUGXDisplayProperties@@XZ");
+        LINK(GXSuspend,             data->gapi->GXSuspend,             "?GXSuspend@@YAHXZ");
+        LINK(GXResume,              data->gapi->GXResume,              "?GXResume@@YAHXZ");
 #undef LINK
 
-	int enable = data->gapi->GXGetDisplayProperties && data->gapi->GXCloseDisplay && data->gapi->GXOpenDisplay &&
-	    data->gapi->GXBeginDraw && data->gapi->GXEndDraw && data->gapi->GXSuspend && data->gapi->GXResume;
+        enable = data->gapi->GXGetDisplayProperties && data->gapi->GXCloseDisplay && data->gapi->GXOpenDisplay &&
+            data->gapi->GXBeginDraw && data->gapi->GXEndDraw && data->gapi->GXSuspend && data->gapi->GXResume;
 
-	if(!enable)
-	{
-	    SDL_SetError("GAPI_Init: error gx.dll: internal error");
-	    GAPI_Quit(data);
-	    return 0;
-	}
+        if(!enable)
+        {
+            SDL_SetError("GAPI_Init: error gx.dll: internal error");
+            GAPI_Quit(data);
+            return 0;
+        }
 
-	if(0 == data->gapi->GXOpenDisplay(hwnd, GX_FULLSCREEN))
-	{
-	    SDL_SetError("GAPI_Init: couldn't initialize GAPI");
-	    GAPI_Quit(data);
-	    return 0;
-	}
+        if(0 == data->gapi->GXOpenDisplay(hwnd, GX_FULLSCREEN))
+        {
+            SDL_SetError("GAPI_Init: couldn't initialize GAPI");
+            GAPI_Quit(data);
+            return 0;
+        }
 
-	struct GXDisplayProperties gxProperties = data->gapi->GXGetDisplayProperties();
+        gxProperties = data->gapi->GXGetDisplayProperties();
 
-	// fill FrameBufferInfo
-	data->fb.xpitch = gxProperties.cbxPitch;
-	data->fb.ypitch = gxProperties.cbyPitch;
-	data->fb.width  = gxProperties.cxWidth;
-	data->fb.height = gxProperties.cyHeight;
-	data->fb.offset = 0;
+        // fill FrameBufferInfo
+        data->fb.xpitch = gxProperties.cbxPitch;
+        data->fb.ypitch = gxProperties.cbyPitch;
+        data->fb.width  = gxProperties.cxWidth;
+        data->fb.height = gxProperties.cyHeight;
+        data->fb.offset = 0;
 
         if((gxProperties.ffFormat & kfDirect565) || 16 == gxProperties.cBPP)
-	    data->format = SDL_PIXELFORMAT_RGB565;
-	else
-	if((gxProperties.ffFormat & kfDirect555) || 15 == gxProperties.cBPP)
-	    data->format = SDL_PIXELFORMAT_RGB555;
-	else
-	    data->format = 0;
+            data->format = SDL_PIXELFORMAT_RGB565;
+        else
+        if((gxProperties.ffFormat & kfDirect555) || 15 == gxProperties.cBPP)
+            data->format = SDL_PIXELFORMAT_RGB555;
+        else
+            data->format = 0;
 
-	// get pixels
-	GXDeviceInfo gxInfo = { 0 };
-	HDC hdc = GetDC(NULL);
+        // get pixels
+        hdc = GetDC(NULL);
 
-	gxInfo.Version = 100;
-	int result = ExtEscape(hdc, GETGXINFO, 0, NULL, sizeof(gxInfo), (char *) &gxInfo);
-	ReleaseDC(NULL, hdc);
+        gxInfo.Version = 100;
+        result = ExtEscape(hdc, GETGXINFO, 0, NULL, sizeof(gxInfo), (char *) &gxInfo);
+        ReleaseDC(NULL, hdc);
 
-	if(result > 0)
-	{
-	    // more debug
-	    if(data->debug)
-	    {
-		printf("GXDeviceInfo.pvFrameBuffer:    %p\n", gxInfo.pvFrameBuffer);
-    		printf("GXDeviceInfo.cxWidth:          %d\n", gxInfo.cxWidth);
-    		printf("GXDeviceInfo.cyHeight:         %d\n", gxInfo.cyHeight);
-    		printf("GXDeviceInfo.cbStride:         %d\n", gxInfo.cbStride);
-    		printf("GXDeviceInfo.cBPP:             %d\n", gxInfo.cBPP);
-    		printf("GXDeviceInfo.ffFormat:        0x%x\n", gxInfo.ffFormat);
+        if(result > 0)
+        {
+            // more debug
+            if(data->debug)
+            {
+                int i;
 
-    		printf("GXDeviceInfo.unk:\n");
-		int ii; for(ii = 0; ii <  sizeof(gxInfo.unknown); ++ii)
-		printf("0x%02hhX,", gxInfo.unknown[ii]);
-		printf("\n");
-	    }
+                printf("GXDeviceInfo.pvFrameBuffer:    %p\n", gxInfo.pvFrameBuffer);
+                printf("GXDeviceInfo.cxWidth:          %d\n", gxInfo.cxWidth);
+                printf("GXDeviceInfo.cyHeight:         %d\n", gxInfo.cyHeight);
+                printf("GXDeviceInfo.cbStride:         %d\n", gxInfo.cbStride);
+                printf("GXDeviceInfo.cBPP:             %d\n", gxInfo.cBPP);
+                printf("GXDeviceInfo.ffFormat:        0x%x\n", gxInfo.ffFormat);
 
-    	    if(gxInfo.ffFormat && gxInfo.ffFormat != gxProperties.ffFormat)
-	    {
-		if((gxInfo.ffFormat & kfDirect565) || 16 == gxInfo.cBPP)
-		    data->format = SDL_PIXELFORMAT_RGB565;
-		else
-		if((gxInfo.ffFormat & kfDirect555) || 15 == gxInfo.cBPP)
-		    data->format = SDL_PIXELFORMAT_RGB555;
-	    }
+                printf("GXDeviceInfo.unk:\n");
+                for(i = 0; i <  sizeof(gxInfo.unknown); ++i)
+                    printf("0x%02hhX,", gxInfo.unknown[i]);
+                printf("\n");
+            }
 
-    	    data->pixels = gxInfo.pvFrameBuffer;
+                if(gxInfo.ffFormat && gxInfo.ffFormat != gxProperties.ffFormat) {
+                    if((gxInfo.ffFormat & kfDirect565) || 16 == gxInfo.cBPP)
+                        data->format = SDL_PIXELFORMAT_RGB565;
+                    else
+                    if((gxInfo.ffFormat & kfDirect555) || 15 == gxInfo.cBPP)
+                        data->format = SDL_PIXELFORMAT_RGB555;
+                }
+
+                data->pixels = gxInfo.pvFrameBuffer;
         }
-	else
-	{
-	    data->flags |= FB_SKIP_OFFSET;
-	    data->pixels = data->gapi->GXBeginDraw();
-	    data->gapi->GXEndDraw();
+        else
+        {
+            data->flags |= FB_SKIP_OFFSET;
+            data->pixels = data->gapi->GXBeginDraw();
+            data->gapi->GXEndDraw();
 
-	    if(data->debug)
-	    {
-		printf("GAPI_Init\n");
-		printf("use GXBeginDraw:               %p\n", data->pixels);
-		printf("use skip offset\n");
-	    }
-	}
+            if(data->debug)
+            {
+                printf("GAPI_Init\n");
+                printf("use GXBeginDraw:               %p\n", data->pixels);
+                printf("use skip offset\n");
+            }
+        }
 
-	if(0 == data->format ||
-	    0 > WINCE_FixedGeometry(&data->fb, SDL_BYTESPERPIXEL(data->format), data->debug))
-	{
-	    SDL_SetError("GAPI_Init: unknown hardware");
-	    GAPI_Quit(data);
-	    return 0;
-	}
+        if(0 == data->format ||
+            0 > WINCE_FixedGeometry(&data->fb, SDL_BYTESPERPIXEL(data->format), data->debug))
+        {
+            SDL_SetError("GAPI_Init: unknown hardware");
+            GAPI_Quit(data);
+            return 0;
+        }
     }
 
     return data->gapi && data->pixels ? 1 : 0;
@@ -994,28 +1004,30 @@
 {
     if(data->gapi)
     {
-	if(data->gapi->GXCloseDisplay) data->gapi->GXCloseDisplay(); 
-	if(data->gapi->hGapiLib)  FreeLibrary(data->gapi->hGapiLib);
+        if(data->gapi->GXCloseDisplay) data->gapi->GXCloseDisplay(); 
+        if(data->gapi->hGapiLib)  FreeLibrary(data->gapi->hGapiLib);
 
-	SDL_free(data->gapi);
+        SDL_free(data->gapi);
         data->gapi = NULL;
     }
 }
 
 int RAW_Init(WINCE_RenderData* data)
 {
+    RawFrameBufferInfo rfbi = { 0 };
+    HDC hdc;
+    int result;
     const char* preferably = SDL_getenv("SDL_VIDEO_RENDERER");
     if(preferably && 0 != SDL_strcasecmp(preferably, RAW_RENDER_NAME)) return 0;
 
-    RawFrameBufferInfo rfbi = { 0 };
-    HDC hdc = GetDC(NULL);
-    int result = ExtEscape(hdc, GETRAWFRAMEBUFFER, 0, NULL, sizeof(RawFrameBufferInfo), (char *) &rfbi);
+    hdc = GetDC(NULL);
+    result = ExtEscape(hdc, GETRAWFRAMEBUFFER, 0, NULL, sizeof(RawFrameBufferInfo), (char *) &rfbi);
     ReleaseDC(NULL, hdc);
 
     //disable
     if(result == 0 || rfbi.pFramePointer == 0 ||
-    	rfbi.cxPixels == 0 || rfbi.cyPixels == 0 ||
-	rfbi.cxStride == 0 || rfbi.cyStride == 0) return 0;
+            rfbi.cxPixels == 0 || rfbi.cyPixels == 0 ||
+        rfbi.cxStride == 0 || rfbi.cyStride == 0) return 0;
 
     data->flags     = FB_RAW_MODE;
 
@@ -1029,19 +1041,19 @@
     data->fb.offset = 0;
 
     if((FORMAT_565 & rfbi.wFormat) || 16 == rfbi.wBPP)
-	data->format = SDL_PIXELFORMAT_RGB565;
+        data->format = SDL_PIXELFORMAT_RGB565;
     else
     if((FORMAT_555 & rfbi.wFormat) || 15 == rfbi.wBPP)
-	data->format = SDL_PIXELFORMAT_RGB555;
+        data->format = SDL_PIXELFORMAT_RGB555;
     else
-	data->format = 0;
+        data->format = 0;
 
     if(0 == data->format ||
-	0 > WINCE_FixedGeometry(&data->fb, SDL_BYTESPERPIXEL(data->format), data->debug))
+        0 > WINCE_FixedGeometry(&data->fb, SDL_BYTESPERPIXEL(data->format), data->debug))
     {
-	SDL_SetError("RAW_Init: unknown hardware");
-	RAW_Quit(data);
-	return 0;
+        SDL_SetError("RAW_Init: unknown hardware");
+        RAW_Quit(data);
+        return 0;
     }
 
     data->pixels = rfbi.pFramePointer;
@@ -1060,50 +1072,50 @@
     // set correct start offset
     switch(orientation)
     {
-	case ORIENTATION_UP:
-	    fb->offset = 0;
-	    break;
+        case ORIENTATION_UP:
+            fb->offset = 0;
+            break;
 
-	case ORIENTATION_LEFT:
-	    fb->offset = __abs(fb->ypitch * (fb->height - 1));
-	    break;
+        case ORIENTATION_LEFT:
+            fb->offset = __abs(fb->ypitch * (fb->height - 1));
+            break;
 
-	case ORIENTATION_RIGHT:
-	    fb->offset = __abs(fb->xpitch * (fb->width - 1));
-	    break;
+        case ORIENTATION_RIGHT:
+            fb->offset = __abs(fb->xpitch * (fb->width - 1));
+            break;
 
-	case ORIENTATION_DOWN:
-	    fb->offset = __abs(fb->xpitch * (fb->width - 1) +
-				fb->ypitch * (fb->height - 1));
-	    break;
+        case ORIENTATION_DOWN:
+            fb->offset = __abs(fb->xpitch * (fb->width - 1) +
+                                fb->ypitch * (fb->height - 1));
+            break;
 
-	default: break;
+        default: break;
     }
 
     //if(orientation != ORIENTATION_UP)
     switch(orientation)
     {
-	case ORIENTATION_LEFT: FrameBufferRotate(fb, ORIENTATION_RIGHT); break;
-	case ORIENTATION_RIGHT:FrameBufferRotate(fb, ORIENTATION_LEFT); break;
-	case ORIENTATION_DOWN: FrameBufferRotate(fb, ORIENTATION_DOWN); break;
+        case ORIENTATION_LEFT: FrameBufferRotate(fb, ORIENTATION_RIGHT); break;
+        case ORIENTATION_RIGHT:FrameBufferRotate(fb, ORIENTATION_LEFT); break;
+        case ORIENTATION_DOWN: FrameBufferRotate(fb, ORIENTATION_DOWN); break;
 
-	default: break;
+        default: break;
     }
 }
 
 int GetFrameBufferOrientation(const FrameBufferInfo* src)
 {
     if(src->xpitch > 0 && src->ypitch > 0)
-	return ORIENTATION_UP;
+        return ORIENTATION_UP;
     else
     if(src->xpitch > 0 && src->ypitch < 0)
-	return ORIENTATION_LEFT;
+        return ORIENTATION_LEFT;
     else
     if(src->xpitch < 0 && src->ypitch > 0)
-	return ORIENTATION_RIGHT;
+        return ORIENTATION_RIGHT;
     else
     if(src->xpitch < 0 && src->ypitch < 0)
-	return ORIENTATION_DOWN;
+        return ORIENTATION_DOWN;
 
     return ORIENTATION_UNKNOWN;
 }
@@ -1117,28 +1129,28 @@
     switch(orientation)
     {
         case ORIENTATION_LEFT:
-	    dst->width  = src.height;
-	    dst->height = src.width;
-	    dst->xpitch = src.ypitch;
-	    dst->ypitch = -src.xpitch;
-	    dst->offset = src.offset + src.xpitch * (src.width - 1);
-	    break;
+            dst->width  = src.height;
+            dst->height = src.width;
+            dst->xpitch = src.ypitch;
+            dst->ypitch = -src.xpitch;
+            dst->offset = src.offset + src.xpitch * (src.width - 1);
+            break;
 
         case ORIENTATION_RIGHT:
-	    dst->width  = src.height;
-	    dst->height = src.width;
-	    dst->xpitch = -src.ypitch;
-	    dst->ypitch = src.xpitch;
-	    dst->offset = src.offset + src.ypitch * (src.height - 1);
-	    break;
+            dst->width  = src.height;
+            dst->height = src.width;
+            dst->xpitch = -src.ypitch;
+            dst->ypitch = src.xpitch;
+            dst->offset = src.offset + src.ypitch * (src.height - 1);
+            break;
 
         case ORIENTATION_DOWN:
-	    FrameBufferRotate(dst, ORIENTATION_LEFT);
-	    FrameBufferRotate(dst, ORIENTATION_LEFT);
-	    break;
+            FrameBufferRotate(dst, ORIENTATION_LEFT);
+            FrameBufferRotate(dst, ORIENTATION_LEFT);
+            break;
 
         default:
-	    break;
+            break;
     }
 }
 
@@ -1146,31 +1158,31 @@
 {
     switch(orientation)
     {
-	case ORIENTATION_UP:
-	    break;
+        case ORIENTATION_UP:
+            break;
 
-	case ORIENTATION_LEFT:
-	{
-	    int temp = pt->y;
-	    pt->y = fb->height - pt->x;
-	    pt->x = temp;
-	}
-	    break;
+        case ORIENTATION_LEFT:
+        {
+            int temp = pt->y;
+            pt->y = fb->height - pt->x;
+            pt->x = temp;
+        }
+            break;
 
-	case ORIENTATION_RIGHT:
-	{
-	    int temp = pt->x;
-	    pt->x = fb->width - pt->y;
-	    pt->y = temp;
-	}
-	    break;
+        case ORIENTATION_RIGHT:
+        {
+            int temp = pt->x;
+            pt->x = fb->width - pt->y;
+            pt->y = temp;
+        }
+            break;
 
-	case ORIENTATION_DOWN:
-	    pt->x = fb->width  - pt->x;
-	    pt->y = fb->height - pt->y;
-	    break;
+        case ORIENTATION_DOWN:
+            pt->x = fb->width  - pt->x;
+            pt->y = fb->height - pt->y;
+            break;
 
-	default: break;
+        default: break;
     }
 }
 
@@ -1196,14 +1208,14 @@
 
     // DMDO_0, DMDO_90, DMDO_180, DMDO_270
     if(DISP_CHANGE_BADMODE != ChangeDisplaySettingsEx(NULL, &sDevMode, 0, CDS_TEST, NULL))
-	switch(sDevMode.dmDisplayOrientation)
-	{
-	    case DMDO_0:	return DMDO_0;
-	    case DMDO_90:	return DMDO_90;
-	    case DMDO_180:	return DMDO_180;
-	    case DMDO_270:	return DMDO_270;
-	    default: break;
-	}
+        switch(sDevMode.dmDisplayOrientation)
+        {
+            case DMDO_0:        return DMDO_0;
+            case DMDO_90:        return DMDO_90;
+            case DMDO_180:        return DMDO_180;
+            case DMDO_270:        return DMDO_270;
+            default: break;
+        }
 
     SDL_SetError("WINCE_GetDMOrientation: ChangeDisplaySettingsEx return BADMODE");
     return -1;
@@ -1217,15 +1229,15 @@
 
     switch(orientation)
     {
-	case DMDO_0:	sDevMode.dmDisplayOrientation = DMDO_0;   break;
-	case DMDO_90:	sDevMode.dmDisplayOrientation = DMDO_90;  break;
-	case DMDO_180:	sDevMode.dmDisplayOrientation = DMDO_180; break;
-	case DMDO_270:	sDevMode.dmDisplayOrientation = DMDO_270; break;
-	default: return 0;
+        case DMDO_0:        sDevMode.dmDisplayOrientation = DMDO_0;   break;
+        case DMDO_90:        sDevMode.dmDisplayOrientation = DMDO_90;  break;
+        case DMDO_180:        sDevMode.dmDisplayOrientation = DMDO_180; break;
+        case DMDO_270:        sDevMode.dmDisplayOrientation = DMDO_270; break;
+        default: return 0;
     }
 
     if(DISP_CHANGE_BADMODE != ChangeDisplaySettingsEx(NULL, &sDevMode, 0, CDS_RESET, NULL))
-	return 1;
+        return 1;
 
     SDL_SetError("WINCE_SetDMOrientation: ChangeDisplaySettingsEx return BADMODE");
     return -1;
@@ -1233,13 +1245,15 @@
 
 void FrameBufferDumpInfo(const FrameBufferInfo* fb, const char* name)
 {
+    int orientation;
+
     printf("%s fb.width:       %d\n", name, fb->width);
     printf("%s fb.height:      %d\n", name, fb->height);
     printf("%s fb.xpitch:      %d\n", name, fb->xpitch);
     printf("%s fb.ypitch:      %d\n", name, fb->ypitch);
     printf("%s fb.offset:      %d\n", name, fb->offset);
 
-    int orientation = GetFrameBufferOrientation(fb);
+    orientation = GetFrameBufferOrientation(fb);
     printf("%s fb.orientation: %d, %s\n", name, orientation, GetOrientationName(orientation));
 }
 
@@ -1247,34 +1261,34 @@
 {
     if(2 == fb->xpitch)
     {
-	switch(width)
-	{
-	    case 1:
-		*dst = *src;
-		break;
+        switch(width)
+        {
+            case 1:
+                *dst = *src;
+                break;
 
-	    case 2:
-		*((Uint32*) dst) = *((Uint32*) src);
-		break;
+            case 2:
+                *((Uint32*) dst) = *((Uint32*) src);
+                break;
 
-	    default:
-		SDL_memcpy(dst, src, width * 2);
-		break;
-	}
+            default:
+                SDL_memcpy(dst, src, width * 2);
+                break;
+        }
     }
     else
     if(-2 == fb->xpitch)
     {
-	while(width--)
-	    *dst-- = *src++;
+        while(width--)
+            *dst-- = *src++;
     }
     else
     {
-	while(width--)
-	{
-	    *dst = *src++;
-	    dst += fb->xpitch / 2;
-	}
+        while(width--)
+        {
+            *dst = *src++;
+            dst += fb->xpitch / 2;
+        }
     }
 }
 
--- a/src/video/windows/SDL_gdirender.c	Mon Jan 24 15:10:16 2011 -0800
+++ b/src/video/windows/SDL_gdirender.c	Mon Jan 24 15:46:11 2011 -0800
@@ -167,8 +167,10 @@
     SDL_WindowData *windowdata = (SDL_WindowData *) window->driverdata;
     SDL_Renderer *renderer;
     GDI_RenderData *data;
+#ifndef NO_GETDIBBITS
     int bmi_size;
     HBITMAP hbm;
+#endif
     int i, n;
 
     renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));
--- a/src/video/windows/SDL_windowsevents.c	Mon Jan 24 15:10:16 2011 -0800
+++ b/src/video/windows/SDL_windowsevents.c	Mon Jan 24 15:46:11 2011 -0800
@@ -192,20 +192,20 @@
 
 	case WM_MOUSEMOVE:
 #ifdef _WIN32_WCE
-	/* transform coords for VGA, WVGA... */
-	{
-	    SDL_VideoData *videodata = data->videodata;
-	    if(videodata->CoordTransform &&
-		(videodata->render == RENDER_GAPI || videodata->render == RENDER_RAW))
-	    {
-		POINT pt;
-		pt.x = LOWORD(lParam);
-		pt.y = HIWORD(lParam);
-		videodata->CoordTransform(data->window, &pt);
-    		SDL_SendMouseMotion(data->window, 0, pt.x, pt.y);
-		break;
-	    }
-	}
+        /* transform coords for VGA, WVGA... */
+        {
+            SDL_VideoData *videodata = data->videodata;
+            if(videodata->CoordTransform &&
+                (videodata->render == RENDER_GAPI || videodata->render == RENDER_RAW))
+            {
+                POINT pt;
+                pt.x = LOWORD(lParam);
+                pt.y = HIWORD(lParam);
+                videodata->CoordTransform(data->window, &pt);
+                    SDL_SendMouseMotion(data->window, 0, pt.x, pt.y);
+                break;
+            }
+        }
 #endif
         SDL_SendMouseMotion(data->window, 0, LOWORD(lParam), HIWORD(lParam));
         break;
@@ -252,12 +252,15 @@
             break;
         }
 
+#ifdef WM_MOUSELEAVE
+    /* FIXME: Do we need the SDL 1.2 hack to generate WM_MOUSELEAVE now? */
     case WM_MOUSELEAVE:
         if (SDL_GetMouseFocus() == data->window) {
             SDL_SetMouseFocus(NULL);
         }
         returnCode = 0;
         break;
+#endif /* WM_MOUSELEAVE */
 
     case WM_SYSKEYDOWN:
     case WM_KEYDOWN:
@@ -382,13 +385,16 @@
         returnCode = 0;
         break;
 
+#ifdef WM_INPUTLANGCHANGE
     case WM_INPUTLANGCHANGE:
         {
             WIN_UpdateKeymap();
         }
         returnCode = 1;
         break;
+#endif /* WM_INPUTLANGCHANGE */
 
+#ifdef WM_GETMINMAXINFO
     case WM_GETMINMAXINFO:
         {
             MINMAXINFO *info;
@@ -447,6 +453,7 @@
         }
         returnCode = 0;
         break;
+#endif /* WM_GETMINMAXINFO */
 
     case WM_WINDOWPOSCHANGED:
         {
@@ -534,6 +541,7 @@
         }
         return (1);
 
+#if defined(SC_SCREENSAVE) || defined(SC_MONITORPOWER)
     case WM_SYSCOMMAND:
         {
             /* Don't start the screensaver or blank the monitor in fullscreen apps */
@@ -545,6 +553,7 @@
             }
         }
         break;
+#endif /* System has screensaver support */
 
     case WM_CLOSE:
         {
@@ -656,7 +665,9 @@
     }
     if (!name && !SDL_Appname) {
         name = "SDL_app";
+#if defined(CS_BYTEALIGNCLIENT) || defined(CS_OWNDC)
         SDL_Appstyle = (CS_BYTEALIGNCLIENT | CS_OWNDC);
+#endif
         SDL_Instance = hInst ? hInst : GetModuleHandle(NULL);
     }
 
--- a/src/video/windows/SDL_windowskeyboard.c	Mon Jan 24 15:10:16 2011 -0800
+++ b/src/video/windows/SDL_windowskeyboard.c	Mon Jan 24 15:46:11 2011 -0800
@@ -21,6 +21,10 @@
 */
 #include "SDL_config.h"
 
+#ifdef _WIN32_WCE
+#define SDL_DISABLE_WINDOWS_IME
+#endif
+
 #include "SDL_windowsvideo.h"
 
 #include "../../events/SDL_keyboard_c.h"
@@ -29,10 +33,12 @@
 #include <imm.h>
 #include <oleauto.h>
 
+#ifndef SDL_DISABLE_WINDOWS_IME
 static void IME_Init(SDL_VideoData *videodata, HWND hwnd);
 static void IME_Enable(SDL_VideoData *videodata, HWND hwnd);
 static void IME_Disable(SDL_VideoData *videodata, HWND hwnd);
 static void IME_Quit(SDL_VideoData *videodata);
+#endif /* !SDL_DISABLE_WINDOWS_IME */
 
 #ifndef MAPVK_VK_TO_VSC
 #define MAPVK_VK_TO_VSC     0
@@ -172,12 +178,15 @@
 void
 WIN_QuitKeyboard(_THIS)
 {
+#ifndef SDL_DISABLE_WINDOWS_IME
     IME_Quit((SDL_VideoData *)_this->driverdata);
+#endif
 }
 
 void
 WIN_StartTextInput(_THIS)
 {
+#ifndef SDL_DISABLE_WINDOWS_IME
     SDL_Window *window = SDL_GetKeyboardFocus();
     if (window) {
         HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
@@ -186,11 +195,13 @@
         IME_Init(videodata, hwnd);
         IME_Enable(videodata, hwnd);
     }
+#endif /* !SDL_DISABLE_WINDOWS_IME */
 }
 
 void
 WIN_StopTextInput(_THIS)
 {
+#ifndef SDL_DISABLE_WINDOWS_IME
     SDL_Window *window = SDL_GetKeyboardFocus();
     if (window) {
         HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
@@ -198,6 +209,7 @@
         IME_Init(videodata, hwnd);
         IME_Disable(videodata, hwnd);
     }
+#endif /* !SDL_DISABLE_WINDOWS_IME */
 }
 
 void
@@ -207,6 +219,21 @@
     videodata->ime_rect = *rect;
 }
 
+#ifdef SDL_DISABLE_WINDOWS_IME
+
+
+SDL_bool
+IME_HandleMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM *lParam, SDL_VideoData *videodata)
+{
+    return SDL_FALSE;
+}
+
+void IME_Present(SDL_VideoData *videodata)
+{
+}
+
+#else
+
 #ifdef __GNUC__
 #undef DEFINE_GUID
 #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}}
@@ -1552,4 +1579,6 @@
     SDL_RenderCopy(videodata->ime_candtex, NULL, &videodata->ime_candlistrect);
 }
 
+#endif /* SDL_DISABLE_WINDOWS_IME */
+
 /* vi: set ts=4 sw=4 expandtab: */
--- a/src/video/windows/SDL_windowsmodes.c	Mon Jan 24 15:10:16 2011 -0800
+++ b/src/video/windows/SDL_windowsmodes.c	Mon Jan 24 15:46:11 2011 -0800
@@ -23,13 +23,19 @@
 
 #include "SDL_windowsvideo.h"
 
+/* Windows CE compatibility */
+#ifndef CDS_FULLSCREEN
+#define CDS_FULLSCREEN 0
+#endif
 
 static SDL_bool
 WIN_GetDisplayMode(LPCTSTR deviceName, DWORD index, SDL_DisplayMode * mode)
 {
     SDL_DisplayModeData *data;
     DEVMODE devmode;
+#ifndef _WIN32_WCE
     HDC hdc;
+#endif
 
     devmode.dmSize = sizeof(devmode);
     devmode.dmDriverExtra = 0;
--- a/src/video/windows/SDL_windowsvideo.c	Mon Jan 24 15:10:16 2011 -0800
+++ b/src/video/windows/SDL_windowsvideo.c	Mon Jan 24 15:46:11 2011 -0800
@@ -161,9 +161,9 @@
 
 	data->userDLL = LoadLibrary(TEXT("USER32.DLL"));
 	if (data->userDLL) {
-		data->CloseTouchInputHandle = (BOOL (WINAPI *)( HTOUCHINPUT )) GetProcAddress(data->userDLL, "CloseTouchInputHandle");
-		data->GetTouchInputInfo = (BOOL (WINAPI *)( HTOUCHINPUT, UINT, PTOUCHINPUT, int )) GetProcAddress(data->userDLL, "GetTouchInputInfo");
-		data->RegisterTouchWindow = (BOOL (WINAPI *)( HWND, ULONG )) GetProcAddress(data->userDLL, "RegisterTouchWindow");
+		data->CloseTouchInputHandle = (BOOL (WINAPI *)( HTOUCHINPUT )) GetProcAddress(data->userDLL, TEXT("CloseTouchInputHandle"));
+		data->GetTouchInputInfo = (BOOL (WINAPI *)( HTOUCHINPUT, UINT, PTOUCHINPUT, int )) GetProcAddress(data->userDLL, TEXT("GetTouchInputInfo"));
+		data->RegisterTouchWindow = (BOOL (WINAPI *)( HWND, ULONG )) GetProcAddress(data->userDLL, TEXT("RegisterTouchWindow"));
 	}
 
     /* Set the function pointers */
@@ -222,11 +222,7 @@
 }
 
 VideoBootStrap WINDOWS_bootstrap = {
-#ifdef _WIN32_WCE
-    "wince", "SDL WinCE video driver", WINCE_Available, WIN_CreateDevice
-#else
-    "windows", "SDL Win32/64 video driver", WIN_Available, WIN_CreateDevice
-#endif
+    "windows", "SDL Windows video driver", WIN_Available, WIN_CreateDevice
 };
 
 int
--- a/src/video/windows/SDL_windowsvideo.h	Mon Jan 24 15:10:16 2011 -0800
+++ b/src/video/windows/SDL_windowsvideo.h	Mon Jan 24 15:46:11 2011 -0800
@@ -36,7 +36,7 @@
 
 #include <windows.h>
 
-#ifndef __GNUC__
+#if defined(_MSC_VER) && !defined(_WIN32_WCE)
 #include <msctf.h>
 #else
 #include "SDL_msctf.h"
--- a/src/video/windows/SDL_windowswindow.c	Mon Jan 24 15:10:16 2011 -0800
+++ b/src/video/windows/SDL_windowswindow.c	Mon Jan 24 15:46:11 2011 -0800
@@ -32,6 +32,10 @@
 #include "SDL_syswm.h"
 #include "SDL_gapirender.h"
 
+/* Windows CE compatibility */
+#ifndef SWP_NOCOPYBITS
+#define SWP_NOCOPYBITS 0
+#endif
 
 /* Fake window to help with DirectInput events. */
 HWND SDL_HelperWindow = NULL;
@@ -68,13 +72,21 @@
     }
 
     /* Set up the window proc function */
+#ifdef GWLP_WNDPROC
     data->wndproc = (WNDPROC) GetWindowLongPtr(hwnd, GWLP_WNDPROC);
     if (data->wndproc == WIN_WindowProc) {
         data->wndproc = NULL;
-    }
-    else {
+    } else {
         SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR) WIN_WindowProc);
     }
+#else
+    data->wndproc = (WNDPROC) GetWindowLong(hwnd, GWL_WNDPROC);
+    if (data->wndproc == WIN_WindowProc) {
+        data->wndproc = NULL;
+    } else {
+        SetWindowLong(hwnd, GWL_WNDPROC, (LONG_PTR) WIN_WindowProc);
+    }
+#endif
 
     /* Fill in the SDL window with the window data */
     {
@@ -112,14 +124,20 @@
         } else {
             window->flags &= ~SDL_WINDOW_RESIZABLE;
         }
+#ifdef WS_MAXIMIZE
         if (style & WS_MAXIMIZE) {
             window->flags |= SDL_WINDOW_MAXIMIZED;
-        } else {
+        } else
+#endif
+        {
             window->flags &= ~SDL_WINDOW_MAXIMIZED;
         }
+#ifdef WS_MINIMIZE
         if (style & WS_MINIMIZE) {
             window->flags |= SDL_WINDOW_MINIMIZED;
-        } else {
+        } else
+#endif
+        {
             window->flags &= ~SDL_WINDOW_MINIMIZED;
         }
     }
--- a/test/testgesture.c	Mon Jan 24 15:10:16 2011 -0800
+++ b/test/testgesture.c	Mon Jan 24 15:46:11 2011 -0800
@@ -19,14 +19,14 @@
 #define PRIu32 "u"
 #endif
 #ifndef PRIs64
-#ifdef __WINDOWS__
+#ifdef __WIN32__
 #define PRIs64 "I64"
 #else
 #define PRIs64 "lld"
 #endif
 #endif
 #ifndef PRIu64
-#ifdef __WINDOWS__
+#ifdef __WIN32__
 #define PRIu64 "I64u"
 #else
 #define PRIu64 "llu"