diff --git a/VS2008/Musashi68K/Musashi68K.vcxproj b/VS2008/Musashi68K/Musashi68K.vcxproj
index 6db21df..873642d 100644
--- a/VS2008/Musashi68K/Musashi68K.vcxproj
+++ b/VS2008/Musashi68K/Musashi68K.vcxproj
@@ -25,24 +25,24 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
diff --git a/VS2008/SDL/SDL.vcproj b/VS2008/SDL/SDL.vcproj
deleted file mode 100755
index f095ea6..0000000
--- a/VS2008/SDL/SDL.vcproj
+++ /dev/null
@@ -1,862 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="SDL"
-	ProjectGUID="{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
-	RootNamespace="SDL"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="$(PlatformName)\$(ConfigurationName)/SDL.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\..\Libraries\SDL-1.2.14\include&quot;;&quot;$(DXSDK_DIR)\Include&quot;"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/SDL.pch"
-				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"
-				ObjectFile="$(PlatformName)\$(ConfigurationName)/"
-				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib dxguid.lib"
-				OutputFile="$(OutDir)\$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;$(DXSDK_DIR)\Lib\x86&quot;"
-				IgnoreAllDefaultLibraries="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/SDL.pdb"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib"
-				CLRUnmanagedCodeCheck="false"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName="$(PlatformName)\$(ConfigurationName)/SDL.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\..\Libraries\SDL-1.2.14\include&quot;;&quot;$(DXSDK_DIR)\Include&quot;"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/SDL.pch"
-				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"
-				ObjectFile="$(PlatformName)\$(ConfigurationName)/"
-				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib dxguid.lib"
-				OutputFile="$(OutDir)\$(ProjectName).dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;$(DXSDK_DIR)\Lib\x64&quot;"
-				IgnoreAllDefaultLibraries="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/SDL.pdb"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib"
-				TargetMachine="17"
-				CLRUnmanagedCodeCheck="false"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="$(PlatformName)\$(ConfigurationName)/SDL.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				EnableIntrinsicFunctions="false"
-				AdditionalIncludeDirectories="&quot;..\..\Libraries\SDL-1.2.14\include&quot;;&quot;$(DXSDK_DIR)\Include&quot;"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/SDL.pch"
-				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"
-				ObjectFile="$(PlatformName)\$(ConfigurationName)/"
-				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib dxguid.lib"
-				OutputFile="$(OutDir)\$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;$(DXSDK_DIR)\Lib\x86&quot;"
-				IgnoreAllDefaultLibraries="false"
-				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/SDL.pdb"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName="$(PlatformName)\$(ConfigurationName)/SDL.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				EnableIntrinsicFunctions="false"
-				AdditionalIncludeDirectories="&quot;..\..\Libraries\SDL-1.2.14\include&quot;;&quot;$(DXSDK_DIR)\Include&quot;"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)\SDL.pch"
-				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\"
-				ObjectFile="$(PlatformName)\$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib dxguid.lib"
-				OutputFile="$(OutDir)\$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;$(DXSDK_DIR)\Lib\x64&quot;"
-				IgnoreAllDefaultLibraries="false"
-				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\SDL.pdb"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(PlatformName)\$(ConfigurationName)\SDL.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Headers Files"
-			>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\audio\SDL_audio_c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\audio\SDL_audiomem.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\SDL_blit.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\SDL_blit_A.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\SDL_cursor_c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\audio\windib\SDL_dibaudio.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\windib\SDL_dibevents_c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\windib\SDL_dibvideo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\audio\disk\SDL_diskaudio.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\audio\dummy\SDL_dummyaudio.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\audio\windx5\SDL_dx5audio.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\Windx5\SDL_dx5events_c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\windx5\SDL_dx5yuv_c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\SDL_error_c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\events\SDL_events_c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\SDL_fatal.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\joystick\SDL_joystick_c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\SDL_leaks.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\wincommon\SDL_lowvideo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\dummy\SDL_nullevents_c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\dummy\SDL_nullmouse_c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\dummy\SDL_nullvideo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\SDL_pixels_c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\SDL_RLEaccel_c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\SDL_stretch_c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\audio\SDL_sysaudio.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\cdrom\SDL_syscdrom.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\events\SDL_sysevents.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\joystick\SDL_sysjoystick.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\wincommon\SDL_sysmouse_c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\thread\SDL_systhread.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\thread\win32\SDL_systhread_c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\timer\SDL_systimer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\SDL_sysvideo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\wincommon\SDL_syswm_c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\thread\SDL_thread_c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\timer\SDL_timer_c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\windib\SDL_vkeys.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\audio\SDL_wave.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\wincommon\SDL_wingl_c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\SDL_yuv_sw_c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\SDL_yuvfuncs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\wincommon\Wmmsg.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\SDL.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\events\SDL_active.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\audio\SDL_audio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\audio\SDL_audiocvt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\SDL_blit.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\SDL_blit_0.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\SDL_blit_1.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\SDL_blit_A.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\SDL_blit_N.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\SDL_bmp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\cdrom\SDL_cdrom.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\cpuinfo\SDL_cpuinfo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\SDL_cursor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\audio\windib\SDL_dibaudio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\windib\SDL_dibevents.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\windib\SDL_dibvideo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\audio\disk\SDL_diskaudio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\audio\dummy\SDL_dummyaudio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\audio\windx5\SDL_dx5audio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\Windx5\SDL_dx5events.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\Windx5\SDL_dx5video.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\Windx5\SDL_dx5video.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\windx5\SDL_dx5yuv.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\SDL_error.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\events\SDL_events.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\events\SDL_expose.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\SDL_fatal.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\SDL_gamma.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\stdlib\SDL_getenv.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\stdlib\SDL_iconv.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\joystick\SDL_joystick.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\events\SDL_keyboard.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\stdlib\SDL_malloc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\audio\SDL_mixer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\audio\SDL_mixer_MMX_VC.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\joystick\win32\SDL_mmjoystick.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\events\SDL_mouse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\dummy\SDL_nullevents.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\dummy\SDL_nullmouse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\dummy\SDL_nullvideo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\SDL_pixels.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\stdlib\SDL_qsort.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\events\SDL_quit.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\events\SDL_resize.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\SDL_RLEaccel.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\file\SDL_rwops.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\stdlib\SDL_stdlib.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\SDL_stretch.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\stdlib\SDL_string.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\SDL_surface.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\cdrom\win32\SDL_syscdrom.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\thread\generic\SDL_syscond.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\wincommon\SDL_sysevents.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\loadso\win32\SDL_sysloadso.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\wincommon\SDL_sysmouse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\thread\win32\SDL_sysmutex.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\thread\win32\SDL_syssem.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\thread\win32\SDL_systhread.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\timer\win32\SDL_systimer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\wincommon\SDL_syswm.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\thread\SDL_thread.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\timer\SDL_timer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\SDL_video.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\audio\SDL_wave.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\wincommon\SDL_wingl.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\SDL_yuv.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\src\video\SDL_yuv_sw.c"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/VS2008/SDL/SDL.vcxproj b/VS2008/SDL/SDL.vcxproj
deleted file mode 100644
index efe9fe8..0000000
--- a/VS2008/SDL/SDL.vcxproj
+++ /dev/null
@@ -1,380 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}</ProjectGuid>
-    <RootNamespace>SDL</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(Platform)\$(Configuration)/SDL.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\Libraries\SDL-1.2.14\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader />
-      <PrecompiledHeaderOutputFile>$(Platform)\$(Configuration)/SDL.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(Platform)\$(Configuration)/</AssemblerListingLocation>
-      <ObjectFileName>$(Platform)\$(Configuration)/</ObjectFileName>
-      <ProgramDataBaseFileName>$(Platform)\$(Configuration)/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>winmm.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)\Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(Platform)\$(Configuration)/SDL.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention />
-      <ImportLibrary>$(Platform)\$(Configuration)/SDL.lib</ImportLibrary>
-      <CLRUnmanagedCodeCheck>false</CLRUnmanagedCodeCheck>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(Platform)\$(Configuration)/SDL.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\Libraries\SDL-1.2.14\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader />
-      <PrecompiledHeaderOutputFile>$(Platform)\$(Configuration)/SDL.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(Platform)\$(Configuration)/</AssemblerListingLocation>
-      <ObjectFileName>$(Platform)\$(Configuration)/</ObjectFileName>
-      <ProgramDataBaseFileName>$(Platform)\$(Configuration)/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>winmm.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)\Lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(Platform)\$(Configuration)/SDL.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention />
-      <ImportLibrary>$(Platform)\$(Configuration)/SDL.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-      <CLRUnmanagedCodeCheck>false</CLRUnmanagedCodeCheck>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(Platform)\$(Configuration)/SDL.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\Libraries\SDL-1.2.14\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader />
-      <PrecompiledHeaderOutputFile>$(Platform)\$(Configuration)/SDL.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(Platform)\$(Configuration)/</AssemblerListingLocation>
-      <ObjectFileName>$(Platform)\$(Configuration)/</ObjectFileName>
-      <ProgramDataBaseFileName>$(Platform)\$(Configuration)/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>winmm.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)\Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ProgramDatabaseFile>$(Platform)\$(Configuration)/SDL.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention />
-      <ImportLibrary>$(Platform)\$(Configuration)/SDL.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(Platform)\$(Configuration)/SDL.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\Libraries\SDL-1.2.14\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader />
-      <PrecompiledHeaderOutputFile>$(Platform)\$(Configuration)\SDL.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(Platform)\$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>$(Platform)\$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>$(Platform)\$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>winmm.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)\Lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ProgramDatabaseFile>$(Platform)\$(Configuration)\SDL.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention />
-      <ImportLibrary>$(Platform)\$(Configuration)\SDL.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\audio\disk\SDL_diskaudio.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\audio\dummy\SDL_dummyaudio.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\audio\SDL_audiomem.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\audio\SDL_audio_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\audio\SDL_sysaudio.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\audio\SDL_wave.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\audio\windib\SDL_dibaudio.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\audio\windx5\SDL_dx5audio.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\cdrom\SDL_syscdrom.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\events\SDL_events_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\events\SDL_sysevents.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\joystick\SDL_joystick_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\joystick\SDL_sysjoystick.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\SDL_error_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\SDL_fatal.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\thread\SDL_systhread.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\thread\SDL_thread_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\thread\win32\SDL_systhread_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\timer\SDL_systimer.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\timer\SDL_timer_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\dummy\SDL_nullevents_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\dummy\SDL_nullmouse_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\dummy\SDL_nullvideo.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_blit.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_blit_A.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_cursor_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_leaks.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_pixels_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_RLEaccel_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_stretch_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_sysvideo.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_yuvfuncs.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_yuv_sw_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\wincommon\SDL_lowvideo.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\wincommon\SDL_sysmouse_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\wincommon\SDL_syswm_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\wincommon\SDL_wingl_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\wincommon\Wmmsg.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\windib\SDL_dibevents_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\windib\SDL_dibvideo.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\windib\SDL_vkeys.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\Windx5\SDL_dx5events_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\Windx5\SDL_dx5video.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\windx5\SDL_dx5yuv_c.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\audio\disk\SDL_diskaudio.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\audio\dummy\SDL_dummyaudio.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\audio\SDL_audio.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\audio\SDL_audiocvt.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\audio\SDL_mixer.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\audio\SDL_mixer_MMX_VC.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\audio\SDL_wave.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\audio\windib\SDL_dibaudio.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\audio\windx5\SDL_dx5audio.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\cdrom\SDL_cdrom.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\cdrom\win32\SDL_syscdrom.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\cpuinfo\SDL_cpuinfo.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\events\SDL_active.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\events\SDL_events.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\events\SDL_expose.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\events\SDL_keyboard.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\events\SDL_mouse.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\events\SDL_quit.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\events\SDL_resize.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\file\SDL_rwops.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\joystick\SDL_joystick.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\joystick\win32\SDL_mmjoystick.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\loadso\win32\SDL_sysloadso.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\SDL.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\SDL_error.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\SDL_fatal.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\stdlib\SDL_getenv.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\stdlib\SDL_iconv.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\stdlib\SDL_malloc.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\stdlib\SDL_qsort.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\stdlib\SDL_stdlib.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\stdlib\SDL_string.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\thread\generic\SDL_syscond.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\thread\SDL_thread.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\thread\win32\SDL_sysmutex.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\thread\win32\SDL_syssem.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\thread\win32\SDL_systhread.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\timer\SDL_timer.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\timer\win32\SDL_systimer.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\dummy\SDL_nullevents.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\dummy\SDL_nullmouse.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\dummy\SDL_nullvideo.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_blit.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_blit_0.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_blit_1.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_blit_A.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_blit_N.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_bmp.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_cursor.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_gamma.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_pixels.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_RLEaccel.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_stretch.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_surface.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_video.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_yuv.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_yuv_sw.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\wincommon\SDL_sysevents.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\wincommon\SDL_sysmouse.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\wincommon\SDL_syswm.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\wincommon\SDL_wingl.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\windib\SDL_dibevents.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\windib\SDL_dibvideo.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\Windx5\SDL_dx5events.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\Windx5\SDL_dx5video.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\windx5\SDL_dx5yuv.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/VS2008/SDLmain/SDLmain.vcproj b/VS2008/SDLmain/SDLmain.vcproj
deleted file mode 100755
index 49a8ec8..0000000
--- a/VS2008/SDLmain/SDLmain.vcproj
+++ /dev/null
@@ -1,320 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="SDLmain"
-	ProjectGUID="{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
-	RootNamespace="SDLmain"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\Libraries\SDL-1.2.14\include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32,NDEBUG,_WINDOWS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/SDLmain.pch"
-				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"
-				ObjectFile="$(PlatformName)\$(ConfigurationName)/"
-				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\$(ProjectName).lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\Libraries\SDL-1.2.14\include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32,NDEBUG,_WINDOWS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)\SDLmain.pch"
-				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\"
-				ObjectFile="$(PlatformName)\$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\$(ProjectName).lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\Libraries\SDL-1.2.14\include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32,_DEBUG,_WINDOWS"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/SDLmain.pch"
-				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"
-				ObjectFile="$(PlatformName)\$(ConfigurationName)/"
-				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="1"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\$(ProjectName).lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\Libraries\SDL-1.2.14\include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32,_DEBUG,_WINDOWS"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/SDLmain.pch"
-				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"
-				ObjectFile="$(PlatformName)\$(ConfigurationName)/"
-				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="1"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\$(ProjectName).lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Filess"
-			>
-			<File
-				RelativePath="..\..\Libraries\SDL-1.2.14\Src\Main\Win32\SDL_win32_main.c"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/VS2008/SDLmain/SDLmain.vcxproj b/VS2008/SDLmain/SDLmain.vcxproj
index 2ed3d66..09d149c 100644
--- a/VS2008/SDLmain/SDLmain.vcxproj
+++ b/VS2008/SDLmain/SDLmain.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -19,29 +19,27 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <ProjectName>SDL2main</ProjectName>
     <ProjectGuid>{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}</ProjectGuid>
     <RootNamespace>SDLmain</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -64,91 +62,79 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
     <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\Libraries\SDL-1.2.14\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)/../../Libraries/SDL2-2.0.12/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader />
-      <PrecompiledHeaderOutputFile>$(Platform)\$(Configuration)/SDLmain.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(Platform)\$(Configuration)/</AssemblerListingLocation>
-      <ObjectFileName>$(Platform)\$(Configuration)/</ObjectFileName>
-      <ProgramDataBaseFileName>$(Platform)\$(Configuration)/</ProgramDataBaseFileName>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
       <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
+      <DebugInformationFormat>OldStyle</DebugInformationFormat>
+      <OmitDefaultLibName>true</OmitDefaultLibName>
     </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\Libraries\SDL-1.2.14\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)/../../Libraries/SDL2-2.0.12/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader />
-      <PrecompiledHeaderOutputFile>$(Platform)\$(Configuration)\SDLmain.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(Platform)\$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>$(Platform)\$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>$(Platform)\$(Configuration)\</ProgramDataBaseFileName>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
       <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
+      <DebugInformationFormat>OldStyle</DebugInformationFormat>
+      <OmitDefaultLibName>true</OmitDefaultLibName>
     </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\Libraries\SDL-1.2.14\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader />
-      <PrecompiledHeaderOutputFile>$(Platform)\$(Configuration)/SDLmain.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(Platform)\$(Configuration)/</AssemblerListingLocation>
-      <ObjectFileName>$(Platform)\$(Configuration)/</ObjectFileName>
-      <ProgramDataBaseFileName>$(Platform)\$(Configuration)/</ProgramDataBaseFileName>
+      <AdditionalIncludeDirectories>$(ProjectDir)/../../Libraries/SDL2-2.0.12/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
       <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
+      <OmitDefaultLibName>true</OmitDefaultLibName>
     </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
@@ -156,26 +142,18 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\Libraries\SDL-1.2.14\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader />
-      <PrecompiledHeaderOutputFile>$(Platform)\$(Configuration)/SDLmain.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(Platform)\$(Configuration)/</AssemblerListingLocation>
-      <ObjectFileName>$(Platform)\$(Configuration)/</ObjectFileName>
-      <ProgramDataBaseFileName>$(Platform)\$(Configuration)/</ProgramDataBaseFileName>
+      <AdditionalIncludeDirectories>$(ProjectDir)/../../Libraries/SDL2-2.0.12/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
       <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
+      <OmitDefaultLibName>true</OmitDefaultLibName>
     </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\Src\Main\Win32\SDL_win32_main.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.12\src\main\windows\SDL_windows_main.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/VS2008/Supermodel.sln b/VS2008/Supermodel.sln
index 00d5fe8..079d0ea 100755
--- a/VS2008/Supermodel.sln
+++ b/VS2008/Supermodel.sln
@@ -1,22 +1,21 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.40629.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.1082
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Supermodel", "Supermodel.vcxproj", "{B114BBD9-8AEA-4DAE-B367-A66A804CB3DD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "SDLmain\SDLmain.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "SDL\SDL.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
+	ProjectSection(ProjectDependencies) = postProject
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZLib", "ZLib\ZLib.vcxproj", "{248D61E0-2E9B-4C73-8839-A31FBCB7D109}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Musashi68K", "Musashi68K\Musashi68K.vcxproj", "{1248CF7C-B122-461C-9624-196AEFAE5046}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E195ADFF-E02F-4AE3-88E8-D90A4EC278A0}"
-	ProjectSection(SolutionItems) = preProject
-		Performance1.psess = Performance1.psess
-	EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2main", "SDLmain\SDLmain.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2", "SDL\SDL.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -34,22 +33,6 @@ Global
 		{B114BBD9-8AEA-4DAE-B367-A66A804CB3DD}.Release|Win32.Build.0 = Release|Win32
 		{B114BBD9-8AEA-4DAE-B367-A66A804CB3DD}.Release|x64.ActiveCfg = Release|x64
 		{B114BBD9-8AEA-4DAE-B367-A66A804CB3DD}.Release|x64.Build.0 = Release|x64
-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.Build.0 = Debug|Win32
-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.ActiveCfg = Debug|x64
-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.Build.0 = Debug|x64
-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.ActiveCfg = Release|Win32
-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.Build.0 = Release|Win32
-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.ActiveCfg = Release|x64
-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.Build.0 = Release|x64
-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.ActiveCfg = Debug|Win32
-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.Build.0 = Debug|Win32
-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.ActiveCfg = Debug|x64
-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.Build.0 = Debug|x64
-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.ActiveCfg = Release|Win32
-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.Build.0 = Release|Win32
-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.ActiveCfg = Release|x64
-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.Build.0 = Release|x64
 		{248D61E0-2E9B-4C73-8839-A31FBCB7D109}.Debug|Win32.ActiveCfg = Debug|Win32
 		{248D61E0-2E9B-4C73-8839-A31FBCB7D109}.Debug|Win32.Build.0 = Debug|Win32
 		{248D61E0-2E9B-4C73-8839-A31FBCB7D109}.Debug|x64.ActiveCfg = Debug|x64
@@ -66,10 +49,29 @@ Global
 		{1248CF7C-B122-461C-9624-196AEFAE5046}.Release|Win32.Build.0 = Release|Win32
 		{1248CF7C-B122-461C-9624-196AEFAE5046}.Release|x64.ActiveCfg = Release|x64
 		{1248CF7C-B122-461C-9624-196AEFAE5046}.Release|x64.Build.0 = Release|x64
+		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.Build.0 = Debug|Win32
+		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.ActiveCfg = Debug|x64
+		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.Build.0 = Debug|x64
+		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.ActiveCfg = Release|Win32
+		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.Build.0 = Release|Win32
+		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.ActiveCfg = Release|x64
+		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.Build.0 = Release|x64
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.ActiveCfg = Debug|Win32
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.Build.0 = Debug|Win32
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.ActiveCfg = Debug|x64
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.Build.0 = Debug|x64
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.ActiveCfg = Release|Win32
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.Build.0 = Release|Win32
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.ActiveCfg = Release|x64
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {D401A375-5949-4129-BE45-10BA8E321555}
+	EndGlobalSection
 	GlobalSection(Performance) = preSolution
 		HasPerformanceSessions = true
 	EndGlobalSection
diff --git a/VS2008/Supermodel.vcxproj b/VS2008/Supermodel.vcxproj
index e7d9b55..133849a 100644
--- a/VS2008/Supermodel.vcxproj
+++ b/VS2008/Supermodel.vcxproj
@@ -22,28 +22,29 @@
     <ProjectGuid>{B114BBD9-8AEA-4DAE-B367-A66A804CB3DD}</ProjectGuid>
     <RootNamespace>Supermodel</RootNamespace>
     <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -67,23 +68,23 @@
     <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Platform)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(Platform)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Platform)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(Platform)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <GenerateManifest>false</GenerateManifest>
@@ -92,7 +93,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\Src;..\Src\OSD;..\Src\OSD\SDL;..\Src\OSD\Windows;..\Libraries\zlib-1.2.4;..\Libraries\SDL-1.2.14\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\Src;..\Src\OSD;..\Src\OSD\SDL;..\Src\OSD\Windows;..\Libraries\zlib-1.2.4;..\Libraries\SDL2-2.0.12\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>SUPERMODEL_WIN32;INLINE=static __inline;_MBCS;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -110,13 +111,11 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>mkdir "$(TargetDir)\Config"
-mkdir "$(TargetDir)\NVRAM"
-mkdir "$(TargetDir)\Saves"
-xcopy /D /Y "$(ProjectDir)\..\Docs\*" "$(TargetDir)"
-xcopy /D /Y "$(ProjectDir)\..\Config\*" "$(TargetDir)\Config"
-xcopy /D /Y "$(ProjectDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)"
-</Command>
+      <Command>if not exist "$(TargetDir)Config" mkdir "$(TargetDir)Config"
+if not exist "$(TargetDir)NVRAM" mkdir "$(TargetDir)NVRAM"
+if not exist "$(TargetDir)Saves" mkdir "$(TargetDir)Saves"
+xcopy /D /Y "$(ProjectDir)..\Docs\*" "$(TargetDir)"
+xcopy /D /Y "$(ProjectDir)..\Config\*" "$(TargetDir)Config"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -125,7 +124,7 @@ xcopy /D /Y "$(ProjectDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDi
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\Src;..\Src\OSD;..\Src\OSD\SDL;..\Src\OSD\Windows;..\Libraries\zlib-1.2.4;..\Libraries\SDL-1.2.14\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\Src;..\Src\OSD;..\Src\OSD\SDL;..\Src\OSD\Windows;..\Libraries\zlib-1.2.4;..\Libraries\SDL2-2.0.12\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>SUPERMODEL_WIN32;INLINE=static __inline;_MBCS;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -143,20 +142,18 @@ xcopy /D /Y "$(ProjectDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDi
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>mkdir "$(TargetDir)\Config"
-mkdir "$(TargetDir)\NVRAM"
-mkdir "$(TargetDir)\Saves"
-xcopy /D /Y "$(ProjectDir)\..\Docs\*" "$(TargetDir)"
-xcopy /D /Y "$(ProjectDir)\..\Config\*" "$(TargetDir)\Config"
-xcopy /D /Y "$(ProjectDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)"
-</Command>
+      <Command>if not exist "$(TargetDir)Config" mkdir "$(TargetDir)Config"
+if not exist "$(TargetDir)NVRAM" mkdir "$(TargetDir)NVRAM"
+if not exist "$(TargetDir)Saves" mkdir "$(TargetDir)Saves"
+xcopy /D /Y "$(ProjectDir)..\Docs\*" "$(TargetDir)"
+xcopy /D /Y "$(ProjectDir)..\Config\*" "$(TargetDir)Config"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <Optimization>Full</Optimization>
       <IntrinsicFunctions>false</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\Src;..\Src\OSD;..\Src\OSD\SDL;..\Src\OSD\Windows;..\Libraries\zlib-1.2.4;..\Libraries\SDL-1.2.14\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\Src;..\Src\OSD;..\Src\OSD\SDL;..\Src\OSD\Windows;..\Libraries\zlib-1.2.4;..\Libraries\SDL2-2.0.12\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>SUPERMODEL_WIN32;INLINE=static __inline;_MBCS;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -175,14 +172,11 @@ xcopy /D /Y "$(ProjectDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDi
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>mkdir "$(TargetDir)\Config"
-mkdir "$(TargetDir)\NVRAM"
-mkdir "$(TargetDir)\Saves"
-xcopy /D /Y "$(ProjectDir)\..\Docs\*" "$(TargetDir)"
-xcopy /D /Y "$(ProjectDir)\..\Config\*" "$(TargetDir)\Config"
-xcopy /D /Y "$(ProjectDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)"
-
-</Command>
+      <Command>if not exist "$(TargetDir)Config" mkdir "$(TargetDir)Config"
+if not exist "$(TargetDir)NVRAM" mkdir "$(TargetDir)NVRAM"
+if not exist "$(TargetDir)Saves" mkdir "$(TargetDir)Saves"
+xcopy /D /Y "$(ProjectDir)..\Docs\*" "$(TargetDir)"
+xcopy /D /Y "$(ProjectDir)..\Config\*" "$(TargetDir)Config"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -192,7 +186,7 @@ xcopy /D /Y "$(ProjectDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDi
     <ClCompile>
       <Optimization>Full</Optimization>
       <IntrinsicFunctions>false</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\Src;..\Src\OSD;..\Src\OSD\SDL;..\Src\OSD\Windows;..\Libraries\zlib-1.2.4;..\Libraries\SDL-1.2.14\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\Src;..\Src\OSD;..\Src\OSD\SDL;..\Src\OSD\Windows;..\Libraries\zlib-1.2.4;..\Libraries\SDL2-2.0.12\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>SUPERMODEL_WIN32;INLINE=static __inline;_MBCS;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -212,13 +206,11 @@ xcopy /D /Y "$(ProjectDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDi
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>mkdir "$(TargetDir)\Config"
-mkdir "$(TargetDir)\NVRAM"
-mkdir "$(TargetDir)\Saves"
-xcopy /D /Y "$(ProjectDir)\..\Docs\*" "$(TargetDir)"
-xcopy /D /Y "$(ProjectDir)\..\Config\*" "$(TargetDir)\Config"
-xcopy /D /Y "$(ProjectDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)"
-</Command>
+      <Command>if not exist "$(TargetDir)Config" mkdir "$(TargetDir)Config"
+if not exist "$(TargetDir)NVRAM" mkdir "$(TargetDir)NVRAM"
+if not exist "$(TargetDir)Saves" mkdir "$(TargetDir)Saves"
+xcopy /D /Y "$(ProjectDir)..\Docs\*" "$(TargetDir)"
+xcopy /D /Y "$(ProjectDir)..\Config\*" "$(TargetDir)Config"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -228,13 +220,9 @@ xcopy /D /Y "$(ProjectDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDi
     </ProjectReference>
     <ProjectReference Include="SDLmain\SDLmain.vcxproj">
       <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
-      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
-      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
     </ProjectReference>
     <ProjectReference Include="SDL\SDL.vcxproj">
       <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
-      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
-      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
     </ProjectReference>
     <ProjectReference Include="ZLib\ZLib.vcxproj">
       <Project>{248d61e0-2e9b-4c73-8839-a31fbcb7d109}</Project>
diff --git a/VS2008/ZLib/ZLib.vcxproj b/VS2008/ZLib/ZLib.vcxproj
index ab020b6..03516ae 100644
--- a/VS2008/ZLib/ZLib.vcxproj
+++ b/VS2008/ZLib/ZLib.vcxproj
@@ -25,22 +25,22 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />