Add missing VS2012 test projects; update VS2010 and VS2012 solutions; update keybord suite for VS compiler warnings
authorAndreas Schiffler <aschiffler@ferzkopp.net>
Mon, 03 Jun 2013 19:24:18 -0700
changeset 7268b399d0441810
parent 7267 7970a2839280
child 7269 f7a0cc4bf74d
Add missing VS2012 test projects; update VS2010 and VS2012 solutions; update keybord suite for VS compiler warnings
VisualC/SDL_VS2010.sln
VisualC/SDL_VS2012.sln
VisualC/tests/testatomic/testatomic_VS2010.vcxproj
VisualC/tests/testatomic/testatomic_VS2012.vcxproj
VisualC/tests/testrendertarget/testrendertarget_VS2010.vcxproj
VisualC/tests/testrendertarget/testrendertarget_VS2012.vcxproj
VisualC/tests/testscale/testscale_VS2010.vcxproj
VisualC/tests/testscale/testscale_VS2012.vcxproj
test/testautomation_keyboard.c
     1.1 --- a/VisualC/SDL_VS2010.sln	Mon Jun 03 07:28:55 2013 -0700
     1.2 +++ b/VisualC/SDL_VS2010.sln	Mon Jun 03 19:24:18 2013 -0700
     1.3 @@ -29,6 +29,12 @@
     1.4  EndProject
     1.5  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testautomation", "tests\testautomation\testautomation_vs2010.vcxproj", "{FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}"
     1.6  EndProject
     1.7 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testatomic", "tests\testatomic\testatomic_VS2010.vcxproj", "{2271060E-98B4-4596-8172-A041E4B2EC7A}"
     1.8 +EndProject
     1.9 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testscale", "tests\testscale\testscale_VS2010.vcxproj", "{E7A6C41C-E059-4C9C-8CCC-73586A540B62}"
    1.10 +EndProject
    1.11 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testrendertarget", "tests\testrendertarget\testrendertarget_VS2010.vcxproj", "{43A06713-A52D-4008-AD7E-A69DF3FCFFA8}"
    1.12 +EndProject
    1.13  Global
    1.14  	GlobalSection(SolutionConfigurationPlatforms) = preSolution
    1.15  		Debug|Win32 = Debug|Win32
    1.16 @@ -141,20 +147,45 @@
    1.17  		{FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|Win32.Build.0 = Release|Win32
    1.18  		{FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|x64.ActiveCfg = Release|x64
    1.19  		{FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|x64.Build.0 = Release|x64
    1.20 +		{2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|Win32.ActiveCfg = Debug|Win32
    1.21 +		{2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|Win32.Build.0 = Debug|Win32
    1.22 +		{2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|x64.ActiveCfg = Debug|Win32
    1.23 +		{2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|Win32.ActiveCfg = Release|Win32
    1.24 +		{2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|Win32.Build.0 = Release|Win32
    1.25 +		{2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|x64.ActiveCfg = Release|Win32
    1.26 +		{E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|Win32.ActiveCfg = Debug|Win32
    1.27 +		{E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|Win32.Build.0 = Debug|Win32
    1.28 +		{E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|x64.ActiveCfg = Debug|x64
    1.29 +		{E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|x64.Build.0 = Debug|x64
    1.30 +		{E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|Win32.ActiveCfg = Release|Win32
    1.31 +		{E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|Win32.Build.0 = Release|Win32
    1.32 +		{E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|x64.ActiveCfg = Release|x64
    1.33 +		{E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|x64.Build.0 = Release|x64
    1.34 +		{43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|Win32.ActiveCfg = Debug|Win32
    1.35 +		{43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|Win32.Build.0 = Debug|Win32
    1.36 +		{43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|x64.ActiveCfg = Debug|x64
    1.37 +		{43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|x64.Build.0 = Debug|x64
    1.38 +		{43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|Win32.ActiveCfg = Release|Win32
    1.39 +		{43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|Win32.Build.0 = Release|Win32
    1.40 +		{43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|x64.ActiveCfg = Release|x64
    1.41 +		{43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|x64.Build.0 = Release|x64
    1.42  	EndGlobalSection
    1.43  	GlobalSection(SolutionProperties) = preSolution
    1.44  		HideSolutionNode = FALSE
    1.45  	EndGlobalSection
    1.46  	GlobalSection(NestedProjects) = preSolution
    1.47 -		{FEE710DB-EC7B-4CCB-BD75-535D401A2FE0} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
    1.48 -		{40FB7794-D3C3-4CFE-BCF4-A80C96635682} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
    1.49 -		{8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
    1.50 +		{AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
    1.51 +		{26932B24-EFC6-4E3A-B277-ED653DA37968} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
    1.52  		{CAE4F1D0-314F-4B10-805B-0EFD670133A0} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
    1.53  		{8B5CFB38-CCBA-40A8-AD7A-89C57B070884} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
    1.54 -		{26932B24-EFC6-4E3A-B277-ED653DA37968} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
    1.55 +		{26828762-C95D-4637-9CB1-7F0979523813} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
    1.56 +		{40FB7794-D3C3-4CFE-BCF4-A80C96635682} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
    1.57 +		{EDEA9D00-AF64-45DE-8F60-5957048F2F0F} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
    1.58 +		{8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
    1.59  		{C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
    1.60 -		{EDEA9D00-AF64-45DE-8F60-5957048F2F0F} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
    1.61 -		{26828762-C95D-4637-9CB1-7F0979523813} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
    1.62 -		{AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
    1.63 +		{FEE710DB-EC7B-4CCB-BD75-535D401A2FE0} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
    1.64 +		{2271060E-98B4-4596-8172-A041E4B2EC7A} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
    1.65 +		{E7A6C41C-E059-4C9C-8CCC-73586A540B62} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
    1.66 +		{43A06713-A52D-4008-AD7E-A69DF3FCFFA8} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
    1.67  	EndGlobalSection
    1.68  EndGlobal
     2.1 --- a/VisualC/SDL_VS2012.sln	Mon Jun 03 07:28:55 2013 -0700
     2.2 +++ b/VisualC/SDL_VS2012.sln	Mon Jun 03 19:24:18 2013 -0700
     2.3 @@ -1,9 +1,9 @@
     2.4  
     2.5  Microsoft Visual Studio Solution File, Format Version 12.00
     2.6  # Visual Studio 2012
     2.7 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "SDL\SDL_VS2012.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
     2.8 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2", "SDL\SDL_VS2012.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
     2.9  EndProject
    2.10 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "SDLmain\SDLmain_VS2012.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
    2.11 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2main", "SDLmain\SDLmain_VS2012.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
    2.12  EndProject
    2.13  Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CE748C1F-3C21-4825-AA6A-F895A023F7E7}"
    2.14  EndProject
    2.15 @@ -64,7 +64,7 @@
    2.16  		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
    2.17  	EndProjectSection
    2.18  EndProject
    2.19 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLtest", "SDLtest\SDLtest_VS2012.vcxproj", "{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}"
    2.20 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2test", "SDLtest\SDLtest_VS2012.vcxproj", "{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}"
    2.21  	ProjectSection(ProjectDependencies) = postProject
    2.22  		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
    2.23  	EndProjectSection
    2.24 @@ -76,6 +76,12 @@
    2.25  		{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
    2.26  	EndProjectSection
    2.27  EndProject
    2.28 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testatomic", "tests\testatomic\testatomic_VS2012.vcxproj", "{2271060E-98B4-4596-8172-A041E4B2EC7A}"
    2.29 +EndProject
    2.30 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testscale", "tests\testscale\testscale_VS2012.vcxproj", "{E7A6C41C-E059-4C9C-8CCC-73586A540B62}"
    2.31 +EndProject
    2.32 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testrendertarget", "tests\testrendertarget\testrendertarget_VS2012.vcxproj", "{43A06713-A52D-4008-AD7E-A69DF3FCFFA8}"
    2.33 +EndProject
    2.34  Global
    2.35  	GlobalSection(SolutionConfigurationPlatforms) = preSolution
    2.36  		Debug|Win32 = Debug|Win32
    2.37 @@ -178,6 +184,30 @@
    2.38  		{FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|Win32.Build.0 = Release|Win32
    2.39  		{FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|x64.ActiveCfg = Release|x64
    2.40  		{FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|x64.Build.0 = Release|x64
    2.41 +		{2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|Win32.ActiveCfg = Debug|Win32
    2.42 +		{2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|Win32.Build.0 = Debug|Win32
    2.43 +		{2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|x64.ActiveCfg = Debug|x64
    2.44 +		{2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|x64.Build.0 = Debug|x64
    2.45 +		{2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|Win32.ActiveCfg = Release|Win32
    2.46 +		{2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|Win32.Build.0 = Release|Win32
    2.47 +		{2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|x64.ActiveCfg = Release|x64
    2.48 +		{2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|x64.Build.0 = Release|x64
    2.49 +		{E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|Win32.ActiveCfg = Debug|Win32
    2.50 +		{E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|Win32.Build.0 = Debug|Win32
    2.51 +		{E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|x64.ActiveCfg = Debug|x64
    2.52 +		{E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|x64.Build.0 = Debug|x64
    2.53 +		{E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|Win32.ActiveCfg = Release|Win32
    2.54 +		{E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|Win32.Build.0 = Release|Win32
    2.55 +		{E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|x64.ActiveCfg = Release|x64
    2.56 +		{E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|x64.Build.0 = Release|x64
    2.57 +		{43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|Win32.ActiveCfg = Debug|Win32
    2.58 +		{43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|Win32.Build.0 = Debug|Win32
    2.59 +		{43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|x64.ActiveCfg = Debug|x64
    2.60 +		{43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|x64.Build.0 = Debug|x64
    2.61 +		{43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|Win32.ActiveCfg = Release|Win32
    2.62 +		{43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|Win32.Build.0 = Release|Win32
    2.63 +		{43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|x64.ActiveCfg = Release|x64
    2.64 +		{43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|x64.Build.0 = Release|x64
    2.65  	EndGlobalSection
    2.66  	GlobalSection(SolutionProperties) = preSolution
    2.67  		HideSolutionNode = FALSE
    2.68 @@ -193,5 +223,8 @@
    2.69  		{8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
    2.70  		{C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
    2.71  		{FEE710DB-EC7B-4CCB-BD75-535D401A2FE0} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
    2.72 +		{2271060E-98B4-4596-8172-A041E4B2EC7A} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
    2.73 +		{E7A6C41C-E059-4C9C-8CCC-73586A540B62} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
    2.74 +		{43A06713-A52D-4008-AD7E-A69DF3FCFFA8} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
    2.75  	EndGlobalSection
    2.76  EndGlobal
     3.1 --- a/VisualC/tests/testatomic/testatomic_VS2010.vcxproj	Mon Jun 03 07:28:55 2013 -0700
     3.2 +++ b/VisualC/tests/testatomic/testatomic_VS2010.vcxproj	Mon Jun 03 19:24:18 2013 -0700
     3.3 @@ -1,22 +1,34 @@
     3.4 -<?xml version="1.0" encoding="utf-8"?>
     3.5 +<?xml version="1.0" encoding="utf-8"?>
     3.6  <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     3.7    <ItemGroup Label="ProjectConfigurations">
     3.8      <ProjectConfiguration Include="Debug|Win32">
     3.9        <Configuration>Debug</Configuration>
    3.10        <Platform>Win32</Platform>
    3.11      </ProjectConfiguration>
    3.12 +    <ProjectConfiguration Include="Debug|x64">
    3.13 +      <Configuration>Debug</Configuration>
    3.14 +      <Platform>x64</Platform>
    3.15 +    </ProjectConfiguration>
    3.16      <ProjectConfiguration Include="Release|Win32">
    3.17        <Configuration>Release</Configuration>
    3.18        <Platform>Win32</Platform>
    3.19      </ProjectConfiguration>
    3.20 +    <ProjectConfiguration Include="Release|x64">
    3.21 +      <Configuration>Release</Configuration>
    3.22 +      <Platform>x64</Platform>
    3.23 +    </ProjectConfiguration>
    3.24    </ItemGroup>
    3.25    <PropertyGroup Label="Globals">
    3.26      <ProjectName>testatomic</ProjectName>
    3.27 -    <ProjectGuid>{C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}</ProjectGuid>
    3.28 +    <ProjectGuid>{2271060E-98B4-4596-8172-A041E4B2EC7A}</ProjectGuid>
    3.29      <RootNamespace>testatomic</RootNamespace>
    3.30    </PropertyGroup>
    3.31    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    3.32 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    3.33 +   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    3.34 +    <ConfigurationType>Application</ConfigurationType>
    3.35 +    <UseOfMfc>false</UseOfMfc>
    3.36 +  </PropertyGroup>
    3.37 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    3.38      <ConfigurationType>Application</ConfigurationType>
    3.39      <UseOfMfc>false</UseOfMfc>
    3.40    </PropertyGroup>
    3.41 @@ -24,26 +36,45 @@
    3.42      <ConfigurationType>Application</ConfigurationType>
    3.43      <UseOfMfc>false</UseOfMfc>
    3.44    </PropertyGroup>
    3.45 -  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    3.46 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    3.47 +    <ConfigurationType>Application</ConfigurationType>
    3.48 +    <UseOfMfc>false</UseOfMfc>
    3.49 +    <CharacterSet>MultiByte</CharacterSet>
    3.50 +  </PropertyGroup>
    3.51 + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    3.52    <ImportGroup Label="ExtensionSettings">
    3.53    </ImportGroup>
    3.54    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    3.55      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    3.56      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    3.57    </ImportGroup>
    3.58 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    3.59 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    3.60 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    3.61 +  </ImportGroup>
    3.62    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    3.63      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    3.64      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    3.65    </ImportGroup>
    3.66 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    3.67 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    3.68 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    3.69 +  </ImportGroup>
    3.70    <PropertyGroup Label="UserMacros" />
    3.71    <PropertyGroup>
    3.72      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    3.73 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
    3.74 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
    3.75 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
    3.76 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
    3.77 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    3.78 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    3.79      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
    3.80 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
    3.81 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
    3.82 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    3.83 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
    3.84 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
    3.85 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    3.86 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    3.87      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    3.88 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    3.89    </PropertyGroup>
    3.90    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    3.91      <Midl>
    3.92 @@ -51,19 +82,14 @@
    3.93        <MkTypLibCompatible>true</MkTypLibCompatible>
    3.94        <SuppressStartupBanner>true</SuppressStartupBanner>
    3.95        <TargetEnvironment>Win32</TargetEnvironment>
    3.96 -      <TypeLibraryName>.\Debug/testatomic.tlb</TypeLibraryName>
    3.97      </Midl>
    3.98      <ClCompile>
    3.99        <Optimization>Disabled</Optimization>
   3.100        <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   3.101        <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   3.102 -      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   3.103 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   3.104        <PrecompiledHeader>
   3.105        </PrecompiledHeader>
   3.106 -      <PrecompiledHeaderOutputFile>.\Debug/testatomic.pch</PrecompiledHeaderOutputFile>
   3.107 -      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
   3.108 -      <ObjectFileName>.\Debug/</ObjectFileName>
   3.109 -      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
   3.110        <WarningLevel>Level3</WarningLevel>
   3.111        <SuppressStartupBanner>true</SuppressStartupBanner>
   3.112        <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
   3.113 @@ -74,13 +100,50 @@
   3.114        <Culture>0x0409</Culture>
   3.115      </ResourceCompile>
   3.116      <Link>
   3.117 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
   3.118 -      <OutputFile>.\Debug/testatomic.exe</OutputFile>
   3.119        <SuppressStartupBanner>true</SuppressStartupBanner>
   3.120        <GenerateDebugInformation>true</GenerateDebugInformation>
   3.121 -      <ProgramDatabaseFile>.\Debug/testatomic.pdb</ProgramDatabaseFile>
   3.122        <SubSystem>Windows</SubSystem>
   3.123      </Link>
   3.124 +    <PostBuildEvent>
   3.125 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
   3.126 +    </PostBuildEvent>
   3.127 +    <PostBuildEvent>
   3.128 +      <Message>Copy SDL</Message>
   3.129 +    </PostBuildEvent>
   3.130 +  </ItemDefinitionGroup>
   3.131 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
   3.132 +    <Midl>
   3.133 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   3.134 +      <MkTypLibCompatible>true</MkTypLibCompatible>
   3.135 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   3.136 +    </Midl>
   3.137 +    <ClCompile>
   3.138 +      <Optimization>Disabled</Optimization>
   3.139 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   3.140 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   3.141 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   3.142 +      <PrecompiledHeader>
   3.143 +      </PrecompiledHeader>
   3.144 +      <WarningLevel>Level3</WarningLevel>
   3.145 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   3.146 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
   3.147 +      <CompileAs>Default</CompileAs>
   3.148 +    </ClCompile>
   3.149 +    <ResourceCompile>
   3.150 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   3.151 +      <Culture>0x0409</Culture>
   3.152 +    </ResourceCompile>
   3.153 +    <Link>
   3.154 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   3.155 +      <GenerateDebugInformation>true</GenerateDebugInformation>
   3.156 +      <SubSystem>Windows</SubSystem>
   3.157 +    </Link>
   3.158 +    <PostBuildEvent>
   3.159 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
   3.160 +    </PostBuildEvent>
   3.161 +    <PostBuildEvent>
   3.162 +      <Message>Copy SDL</Message>
   3.163 +    </PostBuildEvent>
   3.164    </ItemDefinitionGroup>
   3.165    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   3.166      <Midl>
   3.167 @@ -88,7 +151,6 @@
   3.168        <MkTypLibCompatible>true</MkTypLibCompatible>
   3.169        <SuppressStartupBanner>true</SuppressStartupBanner>
   3.170        <TargetEnvironment>Win32</TargetEnvironment>
   3.171 -      <TypeLibraryName>.\Release/testatomic.tlb</TypeLibraryName>
   3.172      </Midl>
   3.173      <ClCompile>
   3.174        <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
   3.175 @@ -99,10 +161,6 @@
   3.176        <FunctionLevelLinking>true</FunctionLevelLinking>
   3.177        <PrecompiledHeader>
   3.178        </PrecompiledHeader>
   3.179 -      <PrecompiledHeaderOutputFile>.\Release/testatomic.pch</PrecompiledHeaderOutputFile>
   3.180 -      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
   3.181 -      <ObjectFileName>.\Release/</ObjectFileName>
   3.182 -      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
   3.183        <WarningLevel>Level3</WarningLevel>
   3.184        <SuppressStartupBanner>true</SuppressStartupBanner>
   3.185        <CompileAs>Default</CompileAs>
   3.186 @@ -112,23 +170,62 @@
   3.187        <Culture>0x0409</Culture>
   3.188      </ResourceCompile>
   3.189      <Link>
   3.190 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
   3.191 -      <OutputFile>.\Release/testatomic.exe</OutputFile>
   3.192        <SuppressStartupBanner>true</SuppressStartupBanner>
   3.193 -      <ProgramDatabaseFile>.\Release/testatomic.pdb</ProgramDatabaseFile>
   3.194        <SubSystem>Windows</SubSystem>
   3.195      </Link>
   3.196 +    <PostBuildEvent>
   3.197 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
   3.198 +    </PostBuildEvent>
   3.199 +    <PostBuildEvent>
   3.200 +      <Message>Copy SDL</Message>
   3.201 +    </PostBuildEvent>
   3.202 +  </ItemDefinitionGroup>
   3.203 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
   3.204 +    <Midl>
   3.205 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   3.206 +      <MkTypLibCompatible>true</MkTypLibCompatible>
   3.207 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   3.208 +    </Midl>
   3.209 +    <ClCompile>
   3.210 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
   3.211 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   3.212 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   3.213 +      <StringPooling>true</StringPooling>
   3.214 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   3.215 +      <FunctionLevelLinking>true</FunctionLevelLinking>
   3.216 +      <PrecompiledHeader>
   3.217 +      </PrecompiledHeader>
   3.218 +      <WarningLevel>Level3</WarningLevel>
   3.219 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   3.220 +      <CompileAs>Default</CompileAs>
   3.221 +    </ClCompile>
   3.222 +    <ResourceCompile>
   3.223 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   3.224 +      <Culture>0x0409</Culture>
   3.225 +    </ResourceCompile>
   3.226 +    <Link>
   3.227 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   3.228 +      <SubSystem>Windows</SubSystem>
   3.229 +    </Link>
   3.230 +    <PostBuildEvent>
   3.231 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
   3.232 +    </PostBuildEvent>
   3.233 +    <PostBuildEvent>
   3.234 +      <Message>Copy SDL</Message>
   3.235 +    </PostBuildEvent>
   3.236    </ItemDefinitionGroup>
   3.237    <ItemGroup>
   3.238 -    <Library Include="..\..\Sdl\Debug\SDL.lib" />
   3.239 -    <Library Include="..\..\SDLmain\Debug\SDLmain.lib" />
   3.240 +    <ClCompile Include="..\..\..\test\testatomic.c" />
   3.241    </ItemGroup>
   3.242    <ItemGroup>
   3.243 -    <ClCompile Include="..\..\..\test\testatomic.c">
   3.244 -      <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug/testatomic.pch</PrecompiledHeaderOutputFile>
   3.245 -    </ClCompile>
   3.246 -  </ItemGroup>
   3.247 +    <ProjectReference Include="..\..\SDLmain\SDLmain_VS2010.vcxproj">
   3.248 +      <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
   3.249 +    </ProjectReference>
   3.250 +    <ProjectReference Include="..\..\SDL\SDL_VS2010.vcxproj">
   3.251 +      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
   3.252 +    </ProjectReference>
   3.253 +  </ItemGroup>  
   3.254    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   3.255    <ImportGroup Label="ExtensionTargets">
   3.256    </ImportGroup>
   3.257 -</Project>
   3.258 +</Project>
   3.259 \ No newline at end of file
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/VisualC/tests/testatomic/testatomic_VS2012.vcxproj	Mon Jun 03 19:24:18 2013 -0700
     4.3 @@ -0,0 +1,235 @@
     4.4 +<?xml version="1.0" encoding="utf-8"?>
     4.5 +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     4.6 +  <ItemGroup Label="ProjectConfigurations">
     4.7 +    <ProjectConfiguration Include="Debug|Win32">
     4.8 +      <Configuration>Debug</Configuration>
     4.9 +      <Platform>Win32</Platform>
    4.10 +    </ProjectConfiguration>
    4.11 +    <ProjectConfiguration Include="Debug|x64">
    4.12 +      <Configuration>Debug</Configuration>
    4.13 +      <Platform>x64</Platform>
    4.14 +    </ProjectConfiguration>
    4.15 +    <ProjectConfiguration Include="Release|Win32">
    4.16 +      <Configuration>Release</Configuration>
    4.17 +      <Platform>Win32</Platform>
    4.18 +    </ProjectConfiguration>
    4.19 +    <ProjectConfiguration Include="Release|x64">
    4.20 +      <Configuration>Release</Configuration>
    4.21 +      <Platform>x64</Platform>
    4.22 +    </ProjectConfiguration>
    4.23 +  </ItemGroup>
    4.24 +  <PropertyGroup Label="Globals">
    4.25 +    <ProjectName>testatomic</ProjectName>
    4.26 +    <ProjectGuid>{2271060E-98B4-4596-8172-A041E4B2EC7A}</ProjectGuid>
    4.27 +    <RootNamespace>testatomic</RootNamespace>
    4.28 +  </PropertyGroup>
    4.29 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    4.30 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    4.31 +    <ConfigurationType>Application</ConfigurationType>
    4.32 +    <UseOfMfc>false</UseOfMfc>
    4.33 +    <PlatformToolset>v110</PlatformToolset>
    4.34 +  </PropertyGroup>
    4.35 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    4.36 +    <ConfigurationType>Application</ConfigurationType>
    4.37 +    <UseOfMfc>false</UseOfMfc>
    4.38 +    <PlatformToolset>v110</PlatformToolset>
    4.39 +  </PropertyGroup>
    4.40 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    4.41 +    <ConfigurationType>Application</ConfigurationType>
    4.42 +    <UseOfMfc>false</UseOfMfc>
    4.43 +    <PlatformToolset>v110</PlatformToolset>
    4.44 +  </PropertyGroup>
    4.45 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    4.46 +    <ConfigurationType>Application</ConfigurationType>
    4.47 +    <UseOfMfc>false</UseOfMfc>
    4.48 +    <CharacterSet>MultiByte</CharacterSet>
    4.49 +    <PlatformToolset>v110</PlatformToolset>
    4.50 +  </PropertyGroup>
    4.51 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    4.52 +  <ImportGroup Label="ExtensionSettings">
    4.53 +  </ImportGroup>
    4.54 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    4.55 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    4.56 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    4.57 +  </ImportGroup>
    4.58 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    4.59 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    4.60 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    4.61 +  </ImportGroup>
    4.62 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    4.63 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    4.64 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    4.65 +  </ImportGroup>
    4.66 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    4.67 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    4.68 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    4.69 +  </ImportGroup>
    4.70 +  <PropertyGroup Label="UserMacros" />
    4.71 +  <PropertyGroup>
    4.72 +    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    4.73 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
    4.74 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
    4.75 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    4.76 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    4.77 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
    4.78 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    4.79 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
    4.80 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
    4.81 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    4.82 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    4.83 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    4.84 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    4.85 +  </PropertyGroup>
    4.86 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    4.87 +    <Midl>
    4.88 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    4.89 +      <MkTypLibCompatible>true</MkTypLibCompatible>
    4.90 +      <SuppressStartupBanner>true</SuppressStartupBanner>
    4.91 +      <TargetEnvironment>Win32</TargetEnvironment>
    4.92 +    </Midl>
    4.93 +    <ClCompile>
    4.94 +      <Optimization>Disabled</Optimization>
    4.95 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    4.96 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    4.97 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    4.98 +      <PrecompiledHeader>
    4.99 +      </PrecompiledHeader>
   4.100 +      <WarningLevel>Level3</WarningLevel>
   4.101 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   4.102 +      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
   4.103 +      <CompileAs>Default</CompileAs>
   4.104 +    </ClCompile>
   4.105 +    <ResourceCompile>
   4.106 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   4.107 +      <Culture>0x0409</Culture>
   4.108 +    </ResourceCompile>
   4.109 +    <Link>
   4.110 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   4.111 +      <GenerateDebugInformation>true</GenerateDebugInformation>
   4.112 +      <SubSystem>Windows</SubSystem>
   4.113 +    </Link>
   4.114 +    <PostBuildEvent>
   4.115 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
   4.116 +    </PostBuildEvent>
   4.117 +    <PostBuildEvent>
   4.118 +      <Message>Copy SDL</Message>
   4.119 +    </PostBuildEvent>
   4.120 +  </ItemDefinitionGroup>
   4.121 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
   4.122 +    <Midl>
   4.123 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   4.124 +      <MkTypLibCompatible>true</MkTypLibCompatible>
   4.125 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   4.126 +    </Midl>
   4.127 +    <ClCompile>
   4.128 +      <Optimization>Disabled</Optimization>
   4.129 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   4.130 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   4.131 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   4.132 +      <PrecompiledHeader>
   4.133 +      </PrecompiledHeader>
   4.134 +      <WarningLevel>Level3</WarningLevel>
   4.135 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   4.136 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
   4.137 +      <CompileAs>Default</CompileAs>
   4.138 +    </ClCompile>
   4.139 +    <ResourceCompile>
   4.140 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   4.141 +      <Culture>0x0409</Culture>
   4.142 +    </ResourceCompile>
   4.143 +    <Link>
   4.144 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   4.145 +      <GenerateDebugInformation>true</GenerateDebugInformation>
   4.146 +      <SubSystem>Windows</SubSystem>
   4.147 +    </Link>
   4.148 +    <PostBuildEvent>
   4.149 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
   4.150 +    </PostBuildEvent>
   4.151 +    <PostBuildEvent>
   4.152 +      <Message>Copy SDL</Message>
   4.153 +    </PostBuildEvent>
   4.154 +  </ItemDefinitionGroup>
   4.155 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   4.156 +    <Midl>
   4.157 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   4.158 +      <MkTypLibCompatible>true</MkTypLibCompatible>
   4.159 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   4.160 +      <TargetEnvironment>Win32</TargetEnvironment>
   4.161 +    </Midl>
   4.162 +    <ClCompile>
   4.163 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
   4.164 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   4.165 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   4.166 +      <StringPooling>true</StringPooling>
   4.167 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   4.168 +      <FunctionLevelLinking>true</FunctionLevelLinking>
   4.169 +      <PrecompiledHeader>
   4.170 +      </PrecompiledHeader>
   4.171 +      <WarningLevel>Level3</WarningLevel>
   4.172 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   4.173 +      <CompileAs>Default</CompileAs>
   4.174 +    </ClCompile>
   4.175 +    <ResourceCompile>
   4.176 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   4.177 +      <Culture>0x0409</Culture>
   4.178 +    </ResourceCompile>
   4.179 +    <Link>
   4.180 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   4.181 +      <SubSystem>Windows</SubSystem>
   4.182 +    </Link>
   4.183 +    <PostBuildEvent>
   4.184 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
   4.185 +    </PostBuildEvent>
   4.186 +    <PostBuildEvent>
   4.187 +      <Message>Copy SDL</Message>
   4.188 +    </PostBuildEvent>
   4.189 +  </ItemDefinitionGroup>
   4.190 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
   4.191 +    <Midl>
   4.192 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   4.193 +      <MkTypLibCompatible>true</MkTypLibCompatible>
   4.194 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   4.195 +    </Midl>
   4.196 +    <ClCompile>
   4.197 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
   4.198 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   4.199 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   4.200 +      <StringPooling>true</StringPooling>
   4.201 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   4.202 +      <FunctionLevelLinking>true</FunctionLevelLinking>
   4.203 +      <PrecompiledHeader>
   4.204 +      </PrecompiledHeader>
   4.205 +      <WarningLevel>Level3</WarningLevel>
   4.206 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   4.207 +      <CompileAs>Default</CompileAs>
   4.208 +    </ClCompile>
   4.209 +    <ResourceCompile>
   4.210 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   4.211 +      <Culture>0x0409</Culture>
   4.212 +    </ResourceCompile>
   4.213 +    <Link>
   4.214 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   4.215 +      <SubSystem>Windows</SubSystem>
   4.216 +    </Link>
   4.217 +    <PostBuildEvent>
   4.218 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
   4.219 +    </PostBuildEvent>
   4.220 +    <PostBuildEvent>
   4.221 +      <Message>Copy SDL</Message>
   4.222 +    </PostBuildEvent>
   4.223 +  </ItemDefinitionGroup>
   4.224 +  <ItemGroup>
   4.225 +    <ClCompile Include="..\..\..\test\testatomic.c" />
   4.226 +  </ItemGroup>
   4.227 +  <ItemGroup>
   4.228 +    <ProjectReference Include="..\..\SDLmain\SDLmain_VS2010.vcxproj">
   4.229 +      <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
   4.230 +    </ProjectReference>
   4.231 +    <ProjectReference Include="..\..\SDL\SDL_VS2010.vcxproj">
   4.232 +      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
   4.233 +    </ProjectReference>
   4.234 +  </ItemGroup>
   4.235 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   4.236 +  <ImportGroup Label="ExtensionTargets">
   4.237 +  </ImportGroup>
   4.238 +</Project>
   4.239 \ No newline at end of file
     5.1 --- a/VisualC/tests/testrendertarget/testrendertarget_VS2010.vcxproj	Mon Jun 03 07:28:55 2013 -0700
     5.2 +++ b/VisualC/tests/testrendertarget/testrendertarget_VS2010.vcxproj	Mon Jun 03 19:24:18 2013 -0700
     5.3 @@ -1,4 +1,4 @@
     5.4 -<?xml version="1.0" encoding="utf-8"?>
     5.5 +<?xml version="1.0" encoding="utf-8"?>
     5.6  <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     5.7    <ItemGroup Label="ProjectConfigurations">
     5.8      <ProjectConfiguration Include="Debug|Win32">
     5.9 @@ -20,10 +20,18 @@
    5.10    </ItemGroup>
    5.11    <PropertyGroup Label="Globals">
    5.12      <ProjectName>testrendertarget</ProjectName>
    5.13 +    <ProjectGuid>{43A06713-A52D-4008-AD7E-A69DF3FCFFA8}</ProjectGuid>
    5.14      <RootNamespace>testrendertarget</RootNamespace>
    5.15 -    <ProjectGuid>{40FB7794-D3C3-4CFE-BCF4-A80C96635682}</ProjectGuid>
    5.16    </PropertyGroup>
    5.17    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    5.18 +   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    5.19 +    <ConfigurationType>Application</ConfigurationType>
    5.20 +    <UseOfMfc>false</UseOfMfc>
    5.21 +  </PropertyGroup>
    5.22 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    5.23 +    <ConfigurationType>Application</ConfigurationType>
    5.24 +    <UseOfMfc>false</UseOfMfc>
    5.25 +  </PropertyGroup>
    5.26    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    5.27      <ConfigurationType>Application</ConfigurationType>
    5.28      <UseOfMfc>false</UseOfMfc>
    5.29 @@ -33,17 +41,17 @@
    5.30      <UseOfMfc>false</UseOfMfc>
    5.31      <CharacterSet>MultiByte</CharacterSet>
    5.32    </PropertyGroup>
    5.33 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    5.34 -    <ConfigurationType>Application</ConfigurationType>
    5.35 -    <UseOfMfc>false</UseOfMfc>
    5.36 -  </PropertyGroup>
    5.37 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    5.38 -    <ConfigurationType>Application</ConfigurationType>
    5.39 -    <UseOfMfc>false</UseOfMfc>
    5.40 -  </PropertyGroup>
    5.41 -  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    5.42 + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    5.43    <ImportGroup Label="ExtensionSettings">
    5.44    </ImportGroup>
    5.45 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    5.46 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5.47 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    5.48 +  </ImportGroup>
    5.49 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    5.50 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5.51 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    5.52 +  </ImportGroup>
    5.53    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    5.54      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5.55      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    5.56 @@ -52,30 +60,95 @@
    5.57      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5.58      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    5.59    </ImportGroup>
    5.60 -  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    5.61 -    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5.62 -    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    5.63 -  </ImportGroup>
    5.64 -  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    5.65 -    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5.66 -    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    5.67 -  </ImportGroup>
    5.68    <PropertyGroup Label="UserMacros" />
    5.69    <PropertyGroup>
    5.70      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    5.71 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
    5.72 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
    5.73 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    5.74 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    5.75 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
    5.76 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    5.77      <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
    5.78      <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
    5.79      <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    5.80      <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    5.81      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    5.82      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    5.83 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
    5.84 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
    5.85 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    5.86 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    5.87 -    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
    5.88 -    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    5.89    </PropertyGroup>
    5.90 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    5.91 +    <Midl>
    5.92 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    5.93 +      <MkTypLibCompatible>true</MkTypLibCompatible>
    5.94 +      <SuppressStartupBanner>true</SuppressStartupBanner>
    5.95 +      <TargetEnvironment>Win32</TargetEnvironment>
    5.96 +    </Midl>
    5.97 +    <ClCompile>
    5.98 +      <Optimization>Disabled</Optimization>
    5.99 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   5.100 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   5.101 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   5.102 +      <PrecompiledHeader>
   5.103 +      </PrecompiledHeader>
   5.104 +      <WarningLevel>Level3</WarningLevel>
   5.105 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   5.106 +      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
   5.107 +      <CompileAs>Default</CompileAs>
   5.108 +    </ClCompile>
   5.109 +    <ResourceCompile>
   5.110 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   5.111 +      <Culture>0x0409</Culture>
   5.112 +    </ResourceCompile>
   5.113 +    <Link>
   5.114 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   5.115 +      <GenerateDebugInformation>true</GenerateDebugInformation>
   5.116 +      <SubSystem>Windows</SubSystem>
   5.117 +    </Link>
   5.118 +    <PostBuildEvent>
   5.119 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
   5.120 +copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
   5.121 +copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"</Command>      
   5.122 +    </PostBuildEvent>
   5.123 +    <PostBuildEvent>
   5.124 +      <Message>Copy SDL and data files</Message>
   5.125 +    </PostBuildEvent>
   5.126 +  </ItemDefinitionGroup>
   5.127 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
   5.128 +    <Midl>
   5.129 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   5.130 +      <MkTypLibCompatible>true</MkTypLibCompatible>
   5.131 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   5.132 +    </Midl>
   5.133 +    <ClCompile>
   5.134 +      <Optimization>Disabled</Optimization>
   5.135 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   5.136 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   5.137 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   5.138 +      <PrecompiledHeader>
   5.139 +      </PrecompiledHeader>
   5.140 +      <WarningLevel>Level3</WarningLevel>
   5.141 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   5.142 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
   5.143 +      <CompileAs>Default</CompileAs>
   5.144 +    </ClCompile>
   5.145 +    <ResourceCompile>
   5.146 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   5.147 +      <Culture>0x0409</Culture>
   5.148 +    </ResourceCompile>
   5.149 +    <Link>
   5.150 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   5.151 +      <GenerateDebugInformation>true</GenerateDebugInformation>
   5.152 +      <SubSystem>Windows</SubSystem>
   5.153 +    </Link>
   5.154 +    <PostBuildEvent>
   5.155 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
   5.156 +copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
   5.157 +copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"</Command>      
   5.158 +    </PostBuildEvent>
   5.159 +    <PostBuildEvent>
   5.160 +      <Message>Copy SDL and data files</Message>
   5.161 +    </PostBuildEvent>
   5.162 +  </ItemDefinitionGroup>
   5.163    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   5.164      <Midl>
   5.165        <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   5.166 @@ -107,7 +180,7 @@
   5.167      <PostBuildEvent>
   5.168        <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
   5.169  copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
   5.170 -copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"</Command>
   5.171 +copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"</Command>      
   5.172      </PostBuildEvent>
   5.173      <PostBuildEvent>
   5.174        <Message>Copy SDL and data files</Message>
   5.175 @@ -143,93 +216,26 @@
   5.176      <PostBuildEvent>
   5.177        <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
   5.178  copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
   5.179 -copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"</Command>
   5.180 -    </PostBuildEvent>
   5.181 -    <PostBuildEvent>
   5.182 -      <Message>Copy SDL and data files</Message>
   5.183 -    </PostBuildEvent>
   5.184 -  </ItemDefinitionGroup>
   5.185 -  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   5.186 -    <Midl>
   5.187 -      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   5.188 -      <MkTypLibCompatible>true</MkTypLibCompatible>
   5.189 -      <SuppressStartupBanner>true</SuppressStartupBanner>
   5.190 -      <TargetEnvironment>Win32</TargetEnvironment>
   5.191 -    </Midl>
   5.192 -    <ClCompile>
   5.193 -      <Optimization>Disabled</Optimization>
   5.194 -      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   5.195 -      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   5.196 -      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   5.197 -      <PrecompiledHeader>
   5.198 -      </PrecompiledHeader>
   5.199 -      <WarningLevel>Level3</WarningLevel>
   5.200 -      <SuppressStartupBanner>true</SuppressStartupBanner>
   5.201 -      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
   5.202 -      <CompileAs>Default</CompileAs>
   5.203 -    </ClCompile>
   5.204 -    <ResourceCompile>
   5.205 -      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   5.206 -      <Culture>0x0409</Culture>
   5.207 -    </ResourceCompile>
   5.208 -    <Link>
   5.209 -      <SuppressStartupBanner>true</SuppressStartupBanner>
   5.210 -      <GenerateDebugInformation>true</GenerateDebugInformation>
   5.211 -      <SubSystem>Windows</SubSystem>
   5.212 -    </Link>
   5.213 -    <PostBuildEvent>
   5.214 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
   5.215 -copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
   5.216 -copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"</Command>
   5.217 -    </PostBuildEvent>
   5.218 -    <PostBuildEvent>
   5.219 -      <Message>Copy SDL and data files</Message>
   5.220 -    </PostBuildEvent>
   5.221 -  </ItemDefinitionGroup>
   5.222 -  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
   5.223 -    <Midl>
   5.224 -      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   5.225 -      <MkTypLibCompatible>true</MkTypLibCompatible>
   5.226 -      <SuppressStartupBanner>true</SuppressStartupBanner>
   5.227 -    </Midl>
   5.228 -    <ClCompile>
   5.229 -      <Optimization>Disabled</Optimization>
   5.230 -      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   5.231 -      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   5.232 -      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   5.233 -      <PrecompiledHeader>
   5.234 -      </PrecompiledHeader>
   5.235 -      <WarningLevel>Level3</WarningLevel>
   5.236 -      <SuppressStartupBanner>true</SuppressStartupBanner>
   5.237 -      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
   5.238 -      <CompileAs>Default</CompileAs>
   5.239 -    </ClCompile>
   5.240 -    <ResourceCompile>
   5.241 -      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   5.242 -      <Culture>0x0409</Culture>
   5.243 -    </ResourceCompile>
   5.244 -    <Link>
   5.245 -      <SuppressStartupBanner>true</SuppressStartupBanner>
   5.246 -      <GenerateDebugInformation>true</GenerateDebugInformation>
   5.247 -      <SubSystem>Windows</SubSystem>
   5.248 -    </Link>
   5.249 -    <PostBuildEvent>
   5.250 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
   5.251 -copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
   5.252 -copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"</Command>
   5.253 +copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"</Command>      
   5.254      </PostBuildEvent>
   5.255      <PostBuildEvent>
   5.256        <Message>Copy SDL and data files</Message>
   5.257      </PostBuildEvent>
   5.258    </ItemDefinitionGroup>
   5.259    <ItemGroup>
   5.260 -    <ClCompile Include="..\..\..\test\common.c" />
   5.261      <ClCompile Include="..\..\..\test\testrendertarget.c" />
   5.262    </ItemGroup>
   5.263    <ItemGroup>
   5.264 -    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
   5.265 -    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
   5.266 -  </ItemGroup>
   5.267 +    <ProjectReference Include="..\..\SDLmain\SDLmain_VS2010.vcxproj">
   5.268 +      <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
   5.269 +    </ProjectReference>
   5.270 +    <ProjectReference Include="..\..\SDLtest\SDLtest_VS2010.vcxproj">
   5.271 +      <Project>{da956fd3-e143-46f2-9fe5-c77bebc56b1a}</Project>
   5.272 +    </ProjectReference>
   5.273 +    <ProjectReference Include="..\..\SDL\SDL_VS2010.vcxproj">
   5.274 +      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
   5.275 +    </ProjectReference>
   5.276 +  </ItemGroup>  
   5.277    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   5.278    <ImportGroup Label="ExtensionTargets">
   5.279    </ImportGroup>
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/VisualC/tests/testrendertarget/testrendertarget_VS2012.vcxproj	Mon Jun 03 19:24:18 2013 -0700
     6.3 @@ -0,0 +1,245 @@
     6.4 +<?xml version="1.0" encoding="utf-8"?>
     6.5 +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     6.6 +  <ItemGroup Label="ProjectConfigurations">
     6.7 +    <ProjectConfiguration Include="Debug|Win32">
     6.8 +      <Configuration>Debug</Configuration>
     6.9 +      <Platform>Win32</Platform>
    6.10 +    </ProjectConfiguration>
    6.11 +    <ProjectConfiguration Include="Debug|x64">
    6.12 +      <Configuration>Debug</Configuration>
    6.13 +      <Platform>x64</Platform>
    6.14 +    </ProjectConfiguration>
    6.15 +    <ProjectConfiguration Include="Release|Win32">
    6.16 +      <Configuration>Release</Configuration>
    6.17 +      <Platform>Win32</Platform>
    6.18 +    </ProjectConfiguration>
    6.19 +    <ProjectConfiguration Include="Release|x64">
    6.20 +      <Configuration>Release</Configuration>
    6.21 +      <Platform>x64</Platform>
    6.22 +    </ProjectConfiguration>
    6.23 +  </ItemGroup>
    6.24 +  <PropertyGroup Label="Globals">
    6.25 +    <ProjectName>testrendertarget</ProjectName>
    6.26 +    <ProjectGuid>{43A06713-A52D-4008-AD7E-A69DF3FCFFA8}</ProjectGuid>
    6.27 +    <RootNamespace>testrendertarget</RootNamespace>
    6.28 +  </PropertyGroup>
    6.29 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    6.30 +   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    6.31 +    <ConfigurationType>Application</ConfigurationType>
    6.32 +    <UseOfMfc>false</UseOfMfc>
    6.33 +    <PlatformToolset>v110</PlatformToolset>
    6.34 +  </PropertyGroup>
    6.35 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    6.36 +    <ConfigurationType>Application</ConfigurationType>
    6.37 +    <UseOfMfc>false</UseOfMfc>
    6.38 +    <PlatformToolset>v110</PlatformToolset>
    6.39 +  </PropertyGroup>
    6.40 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    6.41 +    <ConfigurationType>Application</ConfigurationType>
    6.42 +    <UseOfMfc>false</UseOfMfc>
    6.43 +    <PlatformToolset>v110</PlatformToolset>
    6.44 +  </PropertyGroup>
    6.45 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    6.46 +    <ConfigurationType>Application</ConfigurationType>
    6.47 +    <UseOfMfc>false</UseOfMfc>
    6.48 +    <PlatformToolset>v110</PlatformToolset>
    6.49 +  </PropertyGroup>
    6.50 + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    6.51 +  <ImportGroup Label="ExtensionSettings">
    6.52 +  </ImportGroup>
    6.53 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    6.54 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    6.55 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    6.56 +  </ImportGroup>
    6.57 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    6.58 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    6.59 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    6.60 +  </ImportGroup>
    6.61 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    6.62 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    6.63 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    6.64 +  </ImportGroup>
    6.65 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    6.66 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    6.67 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    6.68 +  </ImportGroup>
    6.69 +  <PropertyGroup Label="UserMacros" />
    6.70 +  <PropertyGroup>
    6.71 +    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    6.72 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
    6.73 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
    6.74 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    6.75 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    6.76 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
    6.77 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    6.78 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
    6.79 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
    6.80 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    6.81 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    6.82 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    6.83 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    6.84 +  </PropertyGroup>
    6.85 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    6.86 +    <Midl>
    6.87 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    6.88 +      <MkTypLibCompatible>true</MkTypLibCompatible>
    6.89 +      <SuppressStartupBanner>true</SuppressStartupBanner>
    6.90 +      <TargetEnvironment>Win32</TargetEnvironment>
    6.91 +    </Midl>
    6.92 +    <ClCompile>
    6.93 +      <Optimization>Disabled</Optimization>
    6.94 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    6.95 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    6.96 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    6.97 +      <PrecompiledHeader>
    6.98 +      </PrecompiledHeader>
    6.99 +      <WarningLevel>Level3</WarningLevel>
   6.100 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   6.101 +      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
   6.102 +      <CompileAs>Default</CompileAs>
   6.103 +    </ClCompile>
   6.104 +    <ResourceCompile>
   6.105 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   6.106 +      <Culture>0x0409</Culture>
   6.107 +    </ResourceCompile>
   6.108 +    <Link>
   6.109 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   6.110 +      <GenerateDebugInformation>true</GenerateDebugInformation>
   6.111 +      <SubSystem>Windows</SubSystem>
   6.112 +    </Link>
   6.113 +    <PostBuildEvent>
   6.114 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
   6.115 +copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
   6.116 +copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"</Command>      
   6.117 +    </PostBuildEvent>
   6.118 +    <PostBuildEvent>
   6.119 +      <Message>Copy SDL and data files</Message>
   6.120 +    </PostBuildEvent>
   6.121 +  </ItemDefinitionGroup>
   6.122 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
   6.123 +    <Midl>
   6.124 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   6.125 +      <MkTypLibCompatible>true</MkTypLibCompatible>
   6.126 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   6.127 +    </Midl>
   6.128 +    <ClCompile>
   6.129 +      <Optimization>Disabled</Optimization>
   6.130 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   6.131 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   6.132 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   6.133 +      <PrecompiledHeader>
   6.134 +      </PrecompiledHeader>
   6.135 +      <WarningLevel>Level3</WarningLevel>
   6.136 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   6.137 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
   6.138 +      <CompileAs>Default</CompileAs>
   6.139 +    </ClCompile>
   6.140 +    <ResourceCompile>
   6.141 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   6.142 +      <Culture>0x0409</Culture>
   6.143 +    </ResourceCompile>
   6.144 +    <Link>
   6.145 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   6.146 +      <GenerateDebugInformation>true</GenerateDebugInformation>
   6.147 +      <SubSystem>Windows</SubSystem>
   6.148 +    </Link>
   6.149 +    <PostBuildEvent>
   6.150 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
   6.151 +copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
   6.152 +copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"</Command>      
   6.153 +    </PostBuildEvent>
   6.154 +    <PostBuildEvent>
   6.155 +      <Message>Copy SDL and data files</Message>
   6.156 +    </PostBuildEvent>
   6.157 +  </ItemDefinitionGroup>
   6.158 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   6.159 +    <Midl>
   6.160 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   6.161 +      <MkTypLibCompatible>true</MkTypLibCompatible>
   6.162 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   6.163 +      <TargetEnvironment>Win32</TargetEnvironment>
   6.164 +    </Midl>
   6.165 +    <ClCompile>
   6.166 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
   6.167 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   6.168 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   6.169 +      <StringPooling>true</StringPooling>
   6.170 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   6.171 +      <FunctionLevelLinking>true</FunctionLevelLinking>
   6.172 +      <PrecompiledHeader>
   6.173 +      </PrecompiledHeader>
   6.174 +      <WarningLevel>Level3</WarningLevel>
   6.175 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   6.176 +      <CompileAs>Default</CompileAs>
   6.177 +    </ClCompile>
   6.178 +    <ResourceCompile>
   6.179 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   6.180 +      <Culture>0x0409</Culture>
   6.181 +    </ResourceCompile>
   6.182 +    <Link>
   6.183 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   6.184 +      <SubSystem>Windows</SubSystem>
   6.185 +    </Link>
   6.186 +    <PostBuildEvent>
   6.187 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
   6.188 +copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
   6.189 +copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"</Command>      
   6.190 +    </PostBuildEvent>
   6.191 +    <PostBuildEvent>
   6.192 +      <Message>Copy SDL and data files</Message>
   6.193 +    </PostBuildEvent>
   6.194 +  </ItemDefinitionGroup>
   6.195 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
   6.196 +    <Midl>
   6.197 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   6.198 +      <MkTypLibCompatible>true</MkTypLibCompatible>
   6.199 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   6.200 +    </Midl>
   6.201 +    <ClCompile>
   6.202 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
   6.203 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   6.204 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   6.205 +      <StringPooling>true</StringPooling>
   6.206 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   6.207 +      <FunctionLevelLinking>true</FunctionLevelLinking>
   6.208 +      <PrecompiledHeader>
   6.209 +      </PrecompiledHeader>
   6.210 +      <WarningLevel>Level3</WarningLevel>
   6.211 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   6.212 +      <CompileAs>Default</CompileAs>
   6.213 +    </ClCompile>
   6.214 +    <ResourceCompile>
   6.215 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   6.216 +      <Culture>0x0409</Culture>
   6.217 +    </ResourceCompile>
   6.218 +    <Link>
   6.219 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   6.220 +      <SubSystem>Windows</SubSystem>
   6.221 +    </Link>
   6.222 +    <PostBuildEvent>
   6.223 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
   6.224 +copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
   6.225 +copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"</Command>      
   6.226 +    </PostBuildEvent>
   6.227 +    <PostBuildEvent>
   6.228 +      <Message>Copy SDL and data files</Message>
   6.229 +    </PostBuildEvent>
   6.230 +  </ItemDefinitionGroup>
   6.231 +  <ItemGroup>
   6.232 +    <ClCompile Include="..\..\..\test\testrendertarget.c" />
   6.233 +  </ItemGroup>
   6.234 +  <ItemGroup>
   6.235 +    <ProjectReference Include="..\..\SDLmain\SDLmain_VS2010.vcxproj">
   6.236 +      <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
   6.237 +    </ProjectReference>
   6.238 +    <ProjectReference Include="..\..\SDLtest\SDLtest_VS2010.vcxproj">
   6.239 +      <Project>{da956fd3-e143-46f2-9fe5-c77bebc56b1a}</Project>
   6.240 +    </ProjectReference>
   6.241 +    <ProjectReference Include="..\..\SDL\SDL_VS2010.vcxproj">
   6.242 +      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
   6.243 +    </ProjectReference>
   6.244 +  </ItemGroup>  
   6.245 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   6.246 +  <ImportGroup Label="ExtensionTargets">
   6.247 +  </ImportGroup>
   6.248 +</Project>
     7.1 --- a/VisualC/tests/testscale/testscale_VS2010.vcxproj	Mon Jun 03 07:28:55 2013 -0700
     7.2 +++ b/VisualC/tests/testscale/testscale_VS2010.vcxproj	Mon Jun 03 19:24:18 2013 -0700
     7.3 @@ -1,4 +1,4 @@
     7.4 -<?xml version="1.0" encoding="utf-8"?>
     7.5 +<?xml version="1.0" encoding="utf-8"?>
     7.6  <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     7.7    <ItemGroup Label="ProjectConfigurations">
     7.8      <ProjectConfiguration Include="Debug|Win32">
     7.9 @@ -20,10 +20,18 @@
    7.10    </ItemGroup>
    7.11    <PropertyGroup Label="Globals">
    7.12      <ProjectName>testscale</ProjectName>
    7.13 +    <ProjectGuid>{E7A6C41C-E059-4C9C-8CCC-73586A540B62}</ProjectGuid>
    7.14      <RootNamespace>testscale</RootNamespace>
    7.15 -    <ProjectGuid>{40FB7794-D3C3-4CFE-BCF4-A80C96635682}</ProjectGuid>
    7.16    </PropertyGroup>
    7.17    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    7.18 +   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    7.19 +    <ConfigurationType>Application</ConfigurationType>
    7.20 +    <UseOfMfc>false</UseOfMfc>
    7.21 +  </PropertyGroup>
    7.22 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    7.23 +    <ConfigurationType>Application</ConfigurationType>
    7.24 +    <UseOfMfc>false</UseOfMfc>
    7.25 +  </PropertyGroup>
    7.26    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    7.27      <ConfigurationType>Application</ConfigurationType>
    7.28      <UseOfMfc>false</UseOfMfc>
    7.29 @@ -33,17 +41,17 @@
    7.30      <UseOfMfc>false</UseOfMfc>
    7.31      <CharacterSet>MultiByte</CharacterSet>
    7.32    </PropertyGroup>
    7.33 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    7.34 -    <ConfigurationType>Application</ConfigurationType>
    7.35 -    <UseOfMfc>false</UseOfMfc>
    7.36 -  </PropertyGroup>
    7.37 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    7.38 -    <ConfigurationType>Application</ConfigurationType>
    7.39 -    <UseOfMfc>false</UseOfMfc>
    7.40 -  </PropertyGroup>
    7.41 -  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    7.42 + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    7.43    <ImportGroup Label="ExtensionSettings">
    7.44    </ImportGroup>
    7.45 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    7.46 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    7.47 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    7.48 +  </ImportGroup>
    7.49 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    7.50 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    7.51 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    7.52 +  </ImportGroup>
    7.53    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    7.54      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    7.55      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    7.56 @@ -52,30 +60,95 @@
    7.57      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    7.58      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    7.59    </ImportGroup>
    7.60 -  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    7.61 -    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    7.62 -    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    7.63 -  </ImportGroup>
    7.64 -  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    7.65 -    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    7.66 -    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    7.67 -  </ImportGroup>
    7.68    <PropertyGroup Label="UserMacros" />
    7.69    <PropertyGroup>
    7.70      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    7.71 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
    7.72 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
    7.73 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    7.74 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    7.75 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
    7.76 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    7.77      <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
    7.78      <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
    7.79      <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    7.80      <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    7.81      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    7.82      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    7.83 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
    7.84 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
    7.85 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    7.86 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    7.87 -    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
    7.88 -    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    7.89    </PropertyGroup>
    7.90 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    7.91 +    <Midl>
    7.92 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    7.93 +      <MkTypLibCompatible>true</MkTypLibCompatible>
    7.94 +      <SuppressStartupBanner>true</SuppressStartupBanner>
    7.95 +      <TargetEnvironment>Win32</TargetEnvironment>
    7.96 +    </Midl>
    7.97 +    <ClCompile>
    7.98 +      <Optimization>Disabled</Optimization>
    7.99 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   7.100 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   7.101 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   7.102 +      <PrecompiledHeader>
   7.103 +      </PrecompiledHeader>
   7.104 +      <WarningLevel>Level3</WarningLevel>
   7.105 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   7.106 +      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
   7.107 +      <CompileAs>Default</CompileAs>
   7.108 +    </ClCompile>
   7.109 +    <ResourceCompile>
   7.110 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   7.111 +      <Culture>0x0409</Culture>
   7.112 +    </ResourceCompile>
   7.113 +    <Link>
   7.114 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   7.115 +      <GenerateDebugInformation>true</GenerateDebugInformation>
   7.116 +      <SubSystem>Windows</SubSystem>
   7.117 +    </Link>
   7.118 +    <PostBuildEvent>
   7.119 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
   7.120 +copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
   7.121 +copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"</Command>      
   7.122 +    </PostBuildEvent>
   7.123 +    <PostBuildEvent>
   7.124 +      <Message>Copy SDL and data files</Message>
   7.125 +    </PostBuildEvent>
   7.126 +  </ItemDefinitionGroup>
   7.127 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
   7.128 +    <Midl>
   7.129 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   7.130 +      <MkTypLibCompatible>true</MkTypLibCompatible>
   7.131 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   7.132 +    </Midl>
   7.133 +    <ClCompile>
   7.134 +      <Optimization>Disabled</Optimization>
   7.135 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   7.136 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   7.137 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   7.138 +      <PrecompiledHeader>
   7.139 +      </PrecompiledHeader>
   7.140 +      <WarningLevel>Level3</WarningLevel>
   7.141 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   7.142 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
   7.143 +      <CompileAs>Default</CompileAs>
   7.144 +    </ClCompile>
   7.145 +    <ResourceCompile>
   7.146 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   7.147 +      <Culture>0x0409</Culture>
   7.148 +    </ResourceCompile>
   7.149 +    <Link>
   7.150 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   7.151 +      <GenerateDebugInformation>true</GenerateDebugInformation>
   7.152 +      <SubSystem>Windows</SubSystem>
   7.153 +    </Link>
   7.154 +    <PostBuildEvent>
   7.155 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
   7.156 +copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
   7.157 +copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"</Command>      
   7.158 +    </PostBuildEvent>
   7.159 +    <PostBuildEvent>
   7.160 +      <Message>Copy SDL and data files</Message>
   7.161 +    </PostBuildEvent>
   7.162 +  </ItemDefinitionGroup>
   7.163    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   7.164      <Midl>
   7.165        <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   7.166 @@ -107,7 +180,7 @@
   7.167      <PostBuildEvent>
   7.168        <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
   7.169  copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
   7.170 -copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"</Command>
   7.171 +copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"</Command>      
   7.172      </PostBuildEvent>
   7.173      <PostBuildEvent>
   7.174        <Message>Copy SDL and data files</Message>
   7.175 @@ -143,93 +216,26 @@
   7.176      <PostBuildEvent>
   7.177        <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
   7.178  copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
   7.179 -copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"</Command>
   7.180 -    </PostBuildEvent>
   7.181 -    <PostBuildEvent>
   7.182 -      <Message>Copy SDL and data files</Message>
   7.183 -    </PostBuildEvent>
   7.184 -  </ItemDefinitionGroup>
   7.185 -  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   7.186 -    <Midl>
   7.187 -      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   7.188 -      <MkTypLibCompatible>true</MkTypLibCompatible>
   7.189 -      <SuppressStartupBanner>true</SuppressStartupBanner>
   7.190 -      <TargetEnvironment>Win32</TargetEnvironment>
   7.191 -    </Midl>
   7.192 -    <ClCompile>
   7.193 -      <Optimization>Disabled</Optimization>
   7.194 -      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   7.195 -      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   7.196 -      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   7.197 -      <PrecompiledHeader>
   7.198 -      </PrecompiledHeader>
   7.199 -      <WarningLevel>Level3</WarningLevel>
   7.200 -      <SuppressStartupBanner>true</SuppressStartupBanner>
   7.201 -      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
   7.202 -      <CompileAs>Default</CompileAs>
   7.203 -    </ClCompile>
   7.204 -    <ResourceCompile>
   7.205 -      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   7.206 -      <Culture>0x0409</Culture>
   7.207 -    </ResourceCompile>
   7.208 -    <Link>
   7.209 -      <SuppressStartupBanner>true</SuppressStartupBanner>
   7.210 -      <GenerateDebugInformation>true</GenerateDebugInformation>
   7.211 -      <SubSystem>Windows</SubSystem>
   7.212 -    </Link>
   7.213 -    <PostBuildEvent>
   7.214 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
   7.215 -copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
   7.216 -copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"</Command>
   7.217 -    </PostBuildEvent>
   7.218 -    <PostBuildEvent>
   7.219 -      <Message>Copy SDL and data files</Message>
   7.220 -    </PostBuildEvent>
   7.221 -  </ItemDefinitionGroup>
   7.222 -  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
   7.223 -    <Midl>
   7.224 -      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   7.225 -      <MkTypLibCompatible>true</MkTypLibCompatible>
   7.226 -      <SuppressStartupBanner>true</SuppressStartupBanner>
   7.227 -    </Midl>
   7.228 -    <ClCompile>
   7.229 -      <Optimization>Disabled</Optimization>
   7.230 -      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   7.231 -      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   7.232 -      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   7.233 -      <PrecompiledHeader>
   7.234 -      </PrecompiledHeader>
   7.235 -      <WarningLevel>Level3</WarningLevel>
   7.236 -      <SuppressStartupBanner>true</SuppressStartupBanner>
   7.237 -      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
   7.238 -      <CompileAs>Default</CompileAs>
   7.239 -    </ClCompile>
   7.240 -    <ResourceCompile>
   7.241 -      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   7.242 -      <Culture>0x0409</Culture>
   7.243 -    </ResourceCompile>
   7.244 -    <Link>
   7.245 -      <SuppressStartupBanner>true</SuppressStartupBanner>
   7.246 -      <GenerateDebugInformation>true</GenerateDebugInformation>
   7.247 -      <SubSystem>Windows</SubSystem>
   7.248 -    </Link>
   7.249 -    <PostBuildEvent>
   7.250 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
   7.251 -copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
   7.252 -copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"</Command>
   7.253 +copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"</Command>      
   7.254      </PostBuildEvent>
   7.255      <PostBuildEvent>
   7.256        <Message>Copy SDL and data files</Message>
   7.257      </PostBuildEvent>
   7.258    </ItemDefinitionGroup>
   7.259    <ItemGroup>
   7.260 -    <ClCompile Include="..\..\..\test\common.c" />
   7.261      <ClCompile Include="..\..\..\test\testscale.c" />
   7.262    </ItemGroup>
   7.263    <ItemGroup>
   7.264 -    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
   7.265 -    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
   7.266 -  </ItemGroup>
   7.267 +    <ProjectReference Include="..\..\SDLmain\SDLmain_VS2010.vcxproj">
   7.268 +      <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
   7.269 +    </ProjectReference>
   7.270 +    <ProjectReference Include="..\..\SDLtest\SDLtest_VS2010.vcxproj">
   7.271 +      <Project>{da956fd3-e143-46f2-9fe5-c77bebc56b1a}</Project>
   7.272 +    </ProjectReference>
   7.273 +    <ProjectReference Include="..\..\SDL\SDL_VS2010.vcxproj">
   7.274 +      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
   7.275 +    </ProjectReference>
   7.276 +  </ItemGroup>  
   7.277    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   7.278    <ImportGroup Label="ExtensionTargets">
   7.279    </ImportGroup>
     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/VisualC/tests/testscale/testscale_VS2012.vcxproj	Mon Jun 03 19:24:18 2013 -0700
     8.3 @@ -0,0 +1,246 @@
     8.4 +<?xml version="1.0" encoding="utf-8"?>
     8.5 +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     8.6 +  <ItemGroup Label="ProjectConfigurations">
     8.7 +    <ProjectConfiguration Include="Debug|Win32">
     8.8 +      <Configuration>Debug</Configuration>
     8.9 +      <Platform>Win32</Platform>
    8.10 +    </ProjectConfiguration>
    8.11 +    <ProjectConfiguration Include="Debug|x64">
    8.12 +      <Configuration>Debug</Configuration>
    8.13 +      <Platform>x64</Platform>
    8.14 +    </ProjectConfiguration>
    8.15 +    <ProjectConfiguration Include="Release|Win32">
    8.16 +      <Configuration>Release</Configuration>
    8.17 +      <Platform>Win32</Platform>
    8.18 +    </ProjectConfiguration>
    8.19 +    <ProjectConfiguration Include="Release|x64">
    8.20 +      <Configuration>Release</Configuration>
    8.21 +      <Platform>x64</Platform>
    8.22 +    </ProjectConfiguration>
    8.23 +  </ItemGroup>
    8.24 +  <PropertyGroup Label="Globals">
    8.25 +    <ProjectName>testscale</ProjectName>
    8.26 +    <ProjectGuid>{E7A6C41C-E059-4C9C-8CCC-73586A540B62}</ProjectGuid>
    8.27 +    <RootNamespace>testscale</RootNamespace>
    8.28 +  </PropertyGroup>
    8.29 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    8.30 +   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    8.31 +    <ConfigurationType>Application</ConfigurationType>
    8.32 +    <UseOfMfc>false</UseOfMfc>
    8.33 +    <PlatformToolset>v110</PlatformToolset>
    8.34 +  </PropertyGroup>
    8.35 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    8.36 +    <ConfigurationType>Application</ConfigurationType>
    8.37 +    <UseOfMfc>false</UseOfMfc>
    8.38 +    <PlatformToolset>v110</PlatformToolset>
    8.39 +  </PropertyGroup>
    8.40 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    8.41 +    <ConfigurationType>Application</ConfigurationType>
    8.42 +    <UseOfMfc>false</UseOfMfc>
    8.43 +    <PlatformToolset>v110</PlatformToolset>
    8.44 +  </PropertyGroup>
    8.45 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    8.46 +    <ConfigurationType>Application</ConfigurationType>
    8.47 +    <UseOfMfc>false</UseOfMfc>
    8.48 +    <CharacterSet>MultiByte</CharacterSet>
    8.49 +    <PlatformToolset>v110</PlatformToolset>
    8.50 +  </PropertyGroup>
    8.51 + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    8.52 +  <ImportGroup Label="ExtensionSettings">
    8.53 +  </ImportGroup>
    8.54 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    8.55 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    8.56 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    8.57 +  </ImportGroup>
    8.58 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    8.59 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    8.60 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    8.61 +  </ImportGroup>
    8.62 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    8.63 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    8.64 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    8.65 +  </ImportGroup>
    8.66 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    8.67 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    8.68 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    8.69 +  </ImportGroup>
    8.70 +  <PropertyGroup Label="UserMacros" />
    8.71 +  <PropertyGroup>
    8.72 +    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    8.73 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
    8.74 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
    8.75 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    8.76 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    8.77 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
    8.78 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    8.79 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
    8.80 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
    8.81 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    8.82 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    8.83 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    8.84 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    8.85 +  </PropertyGroup>
    8.86 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    8.87 +    <Midl>
    8.88 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    8.89 +      <MkTypLibCompatible>true</MkTypLibCompatible>
    8.90 +      <SuppressStartupBanner>true</SuppressStartupBanner>
    8.91 +      <TargetEnvironment>Win32</TargetEnvironment>
    8.92 +    </Midl>
    8.93 +    <ClCompile>
    8.94 +      <Optimization>Disabled</Optimization>
    8.95 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8.96 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    8.97 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    8.98 +      <PrecompiledHeader>
    8.99 +      </PrecompiledHeader>
   8.100 +      <WarningLevel>Level3</WarningLevel>
   8.101 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   8.102 +      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
   8.103 +      <CompileAs>Default</CompileAs>
   8.104 +    </ClCompile>
   8.105 +    <ResourceCompile>
   8.106 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   8.107 +      <Culture>0x0409</Culture>
   8.108 +    </ResourceCompile>
   8.109 +    <Link>
   8.110 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   8.111 +      <GenerateDebugInformation>true</GenerateDebugInformation>
   8.112 +      <SubSystem>Windows</SubSystem>
   8.113 +    </Link>
   8.114 +    <PostBuildEvent>
   8.115 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
   8.116 +copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
   8.117 +copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"</Command>      
   8.118 +    </PostBuildEvent>
   8.119 +    <PostBuildEvent>
   8.120 +      <Message>Copy SDL and data files</Message>
   8.121 +    </PostBuildEvent>
   8.122 +  </ItemDefinitionGroup>
   8.123 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
   8.124 +    <Midl>
   8.125 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   8.126 +      <MkTypLibCompatible>true</MkTypLibCompatible>
   8.127 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   8.128 +    </Midl>
   8.129 +    <ClCompile>
   8.130 +      <Optimization>Disabled</Optimization>
   8.131 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   8.132 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   8.133 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   8.134 +      <PrecompiledHeader>
   8.135 +      </PrecompiledHeader>
   8.136 +      <WarningLevel>Level3</WarningLevel>
   8.137 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   8.138 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
   8.139 +      <CompileAs>Default</CompileAs>
   8.140 +    </ClCompile>
   8.141 +    <ResourceCompile>
   8.142 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   8.143 +      <Culture>0x0409</Culture>
   8.144 +    </ResourceCompile>
   8.145 +    <Link>
   8.146 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   8.147 +      <GenerateDebugInformation>true</GenerateDebugInformation>
   8.148 +      <SubSystem>Windows</SubSystem>
   8.149 +    </Link>
   8.150 +    <PostBuildEvent>
   8.151 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
   8.152 +copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
   8.153 +copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"</Command>      
   8.154 +    </PostBuildEvent>
   8.155 +    <PostBuildEvent>
   8.156 +      <Message>Copy SDL and data files</Message>
   8.157 +    </PostBuildEvent>
   8.158 +  </ItemDefinitionGroup>
   8.159 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   8.160 +    <Midl>
   8.161 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   8.162 +      <MkTypLibCompatible>true</MkTypLibCompatible>
   8.163 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   8.164 +      <TargetEnvironment>Win32</TargetEnvironment>
   8.165 +    </Midl>
   8.166 +    <ClCompile>
   8.167 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
   8.168 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   8.169 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   8.170 +      <StringPooling>true</StringPooling>
   8.171 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   8.172 +      <FunctionLevelLinking>true</FunctionLevelLinking>
   8.173 +      <PrecompiledHeader>
   8.174 +      </PrecompiledHeader>
   8.175 +      <WarningLevel>Level3</WarningLevel>
   8.176 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   8.177 +      <CompileAs>Default</CompileAs>
   8.178 +    </ClCompile>
   8.179 +    <ResourceCompile>
   8.180 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   8.181 +      <Culture>0x0409</Culture>
   8.182 +    </ResourceCompile>
   8.183 +    <Link>
   8.184 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   8.185 +      <SubSystem>Windows</SubSystem>
   8.186 +    </Link>
   8.187 +    <PostBuildEvent>
   8.188 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
   8.189 +copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
   8.190 +copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"</Command>      
   8.191 +    </PostBuildEvent>
   8.192 +    <PostBuildEvent>
   8.193 +      <Message>Copy SDL and data files</Message>
   8.194 +    </PostBuildEvent>
   8.195 +  </ItemDefinitionGroup>
   8.196 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
   8.197 +    <Midl>
   8.198 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   8.199 +      <MkTypLibCompatible>true</MkTypLibCompatible>
   8.200 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   8.201 +    </Midl>
   8.202 +    <ClCompile>
   8.203 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
   8.204 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   8.205 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   8.206 +      <StringPooling>true</StringPooling>
   8.207 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   8.208 +      <FunctionLevelLinking>true</FunctionLevelLinking>
   8.209 +      <PrecompiledHeader>
   8.210 +      </PrecompiledHeader>
   8.211 +      <WarningLevel>Level3</WarningLevel>
   8.212 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   8.213 +      <CompileAs>Default</CompileAs>
   8.214 +    </ClCompile>
   8.215 +    <ResourceCompile>
   8.216 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   8.217 +      <Culture>0x0409</Culture>
   8.218 +    </ResourceCompile>
   8.219 +    <Link>
   8.220 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   8.221 +      <SubSystem>Windows</SubSystem>
   8.222 +    </Link>
   8.223 +    <PostBuildEvent>
   8.224 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
   8.225 +copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"
   8.226 +copy "$(SolutionDir)\..\test\sample.bmp" "$(TargetDir)\sample.bmp"</Command>      
   8.227 +    </PostBuildEvent>
   8.228 +    <PostBuildEvent>
   8.229 +      <Message>Copy SDL and data files</Message>
   8.230 +    </PostBuildEvent>
   8.231 +  </ItemDefinitionGroup>
   8.232 +  <ItemGroup>
   8.233 +    <ClCompile Include="..\..\..\test\testscale.c" />
   8.234 +  </ItemGroup>
   8.235 +  <ItemGroup>
   8.236 +    <ProjectReference Include="..\..\SDLmain\SDLmain_VS2010.vcxproj">
   8.237 +      <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
   8.238 +    </ProjectReference>
   8.239 +    <ProjectReference Include="..\..\SDLtest\SDLtest_VS2010.vcxproj">
   8.240 +      <Project>{da956fd3-e143-46f2-9fe5-c77bebc56b1a}</Project>
   8.241 +    </ProjectReference>
   8.242 +    <ProjectReference Include="..\..\SDL\SDL_VS2010.vcxproj">
   8.243 +      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
   8.244 +    </ProjectReference>
   8.245 +  </ItemGroup>  
   8.246 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   8.247 +  <ImportGroup Label="ExtensionTargets">
   8.248 +  </ImportGroup>
   8.249 +</Project>
     9.1 --- a/test/testautomation_keyboard.c	Mon Jun 03 07:28:55 2013 -0700
     9.2 +++ b/test/testautomation_keyboard.c	Mon Jun 03 19:24:18 2013 -0700
     9.3 @@ -25,13 +25,13 @@
     9.4     Uint8 *state;
     9.5  
     9.6     /* Case where numkeys pointer is NULL */
     9.7 -   state = SDL_GetKeyboardState(NULL);
     9.8 +   state = (Uint8 *)SDL_GetKeyboardState(NULL);
     9.9     SDLTest_AssertPass("Call to SDL_GetKeyboardState(NULL)");
    9.10     SDLTest_AssertCheck(state != NULL, "Validate that return value from SDL_GetKeyboardState is not NULL");
    9.11  
    9.12     /* Case where numkeys pointer is not NULL */
    9.13     numkeys = -1;
    9.14 -   state = SDL_GetKeyboardState(&numkeys);
    9.15 +   state = (Uint8 *)SDL_GetKeyboardState(&numkeys);
    9.16     SDLTest_AssertPass("Call to SDL_GetKeyboardState(&numkeys)");
    9.17     SDLTest_AssertCheck(state != NULL, "Validate that return value from SDL_GetKeyboardState is not NULL");
    9.18     SDLTest_AssertCheck(numkeys >= 0, "Validate that value of numkeys is >= 0, got: %i", numkeys);