Fixed bug 1185 (VS 2010 project files do not support side-by-side 32-bit and 64-bit builds)
authorSam Lantinga
Tue, 19 Apr 2011 09:53:01 -0700
changeset 5540918efbff8259
parent 5539 b305e3c2d2e7
child 5541 b63f1383f8c9
Fixed bug 1185 (VS 2010 project files do not support side-by-side 32-bit and 64-bit builds)

Ed Kiser 2011-04-19 09:28:53 PDT

The Visual Studio 2010 project files have hard-coded relative paths which
prevent them from doing side-by-side 32-bit and 64-bit builds.

I have attached a patch that appears to fix this problem.
VisualC/SDL/SDL_VS2010.vcxproj
VisualC/SDL_VS2010.sln
VisualC/SDLmain/SDLmain_VS2010.vcxproj
VisualC/tests/automated/automated_VS2010.vcxproj
VisualC/tests/checkkeys/checkkeys_VS2010.vcxproj
VisualC/tests/graywin/graywin_VS2010.vcxproj
VisualC/tests/loopwave/loopwave_VS2010.vcxproj
VisualC/tests/testalpha/testalpha_VS2010.vcxproj
VisualC/tests/testcursor/testcursor_VS2010.vcxproj
VisualC/tests/testdraw2/testdraw2_VS2010.vcxproj
VisualC/tests/testfile/testfile_VS2010.vcxproj
VisualC/tests/testgamma/testgamma_VS2010.vcxproj
VisualC/tests/testgl/testgl_VS2010.vcxproj
VisualC/tests/testgl2/testgl2_VS2010.vcxproj
VisualC/tests/testjoystick/testjoystick_VS2010.vcxproj
VisualC/tests/testoverlay/testoverlay_VS2010.vcxproj
VisualC/tests/testoverlay2/testoverlay2_VS2010.vcxproj
VisualC/tests/testplatform/testplatform_VS2010.vcxproj
VisualC/tests/testpower/testpower_VS2010.vcxproj
VisualC/tests/testshape/testshape_VS2010.vcxproj
VisualC/tests/testsprite/testsprite_VS2010.vcxproj
VisualC/tests/testsprite2/testsprite2_VS2010.vcxproj
VisualC/tests/testvidinfo/testvidinfo_VS2010.vcxproj
VisualC/tests/testwin/testwin_VS2010.vcxproj
VisualC/tests/testwm/testwm_VS2010.vcxproj
     1.1 --- a/VisualC/SDL/SDL_VS2010.vcxproj	Tue Apr 19 08:08:50 2011 -0700
     1.2 +++ b/VisualC/SDL/SDL_VS2010.vcxproj	Tue Apr 19 09:53:01 2011 -0700
     1.3 @@ -39,6 +39,7 @@
     1.4    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     1.5      <ConfigurationType>DynamicLibrary</ConfigurationType>
     1.6      <UseOfMfc>false</UseOfMfc>
     1.7 +    <CharacterSet>MultiByte</CharacterSet>
     1.8    </PropertyGroup>
     1.9    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    1.10    <ImportGroup Label="ExtensionSettings">
    1.11 @@ -62,12 +63,12 @@
    1.12    <PropertyGroup Label="UserMacros" />
    1.13    <PropertyGroup>
    1.14      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    1.15 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
    1.16 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
    1.17 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
    1.18 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    1.19      <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
    1.20      <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    1.21 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
    1.22 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
    1.23 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
    1.24 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    1.25      <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
    1.26      <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    1.27    </PropertyGroup>
    1.28 @@ -78,7 +79,6 @@
    1.29        <MkTypLibCompatible>true</MkTypLibCompatible>
    1.30        <SuppressStartupBanner>true</SuppressStartupBanner>
    1.31        <TargetEnvironment>Win32</TargetEnvironment>
    1.32 -      <TypeLibraryName>.\Debug/SDL.tlb</TypeLibraryName>
    1.33      </Midl>
    1.34      <ClCompile>
    1.35        <Optimization>Disabled</Optimization>
    1.36 @@ -99,7 +99,6 @@
    1.37      </ResourceCompile>
    1.38      <Link>
    1.39        <AdditionalDependencies>winmm.lib;imm32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
    1.40 -      <OutputFile>$(IntDir)SDL.dll</OutputFile>
    1.41        <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
    1.42        <GenerateDebugInformation>true</GenerateDebugInformation>
    1.43        <SubSystem>Windows</SubSystem>
    1.44 @@ -112,13 +111,12 @@
    1.45        <MkTypLibCompatible>true</MkTypLibCompatible>
    1.46        <SuppressStartupBanner>true</SuppressStartupBanner>
    1.47        <TargetEnvironment>X64</TargetEnvironment>
    1.48 -      <TypeLibraryName>.\Debug/SDL.tlb</TypeLibraryName>
    1.49      </Midl>
    1.50      <ClCompile>
    1.51        <Optimization>Disabled</Optimization>
    1.52        <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1.53        <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    1.54 -      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    1.55 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    1.56        <BufferSecurityCheck>false</BufferSecurityCheck>
    1.57        <PrecompiledHeader>
    1.58        </PrecompiledHeader>
    1.59 @@ -131,11 +129,9 @@
    1.60      </ResourceCompile>
    1.61      <Link>
    1.62        <AdditionalDependencies>winmm.lib;imm32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
    1.63 -      <OutputFile>$(IntDir)SDL.dll</OutputFile>
    1.64        <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
    1.65        <GenerateDebugInformation>true</GenerateDebugInformation>
    1.66        <SubSystem>Windows</SubSystem>
    1.67 -      <TargetMachine>MachineX64</TargetMachine>
    1.68        <CLRUnmanagedCodeCheck>false</CLRUnmanagedCodeCheck>
    1.69      </Link>
    1.70    </ItemDefinitionGroup>
    1.71 @@ -146,7 +142,6 @@
    1.72        <MkTypLibCompatible>true</MkTypLibCompatible>
    1.73        <SuppressStartupBanner>true</SuppressStartupBanner>
    1.74        <TargetEnvironment>Win32</TargetEnvironment>
    1.75 -      <TypeLibraryName>.\Release/SDL.tlb</TypeLibraryName>
    1.76      </Midl>
    1.77      <ClCompile>
    1.78        <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
    1.79 @@ -169,7 +164,6 @@
    1.80      </ResourceCompile>
    1.81      <Link>
    1.82        <AdditionalDependencies>winmm.lib;imm32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
    1.83 -      <OutputFile>$(IntDir)SDL.dll</OutputFile>
    1.84        <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
    1.85        <SubSystem>Windows</SubSystem>
    1.86      </Link>
    1.87 @@ -180,7 +174,6 @@
    1.88        <MkTypLibCompatible>true</MkTypLibCompatible>
    1.89        <SuppressStartupBanner>true</SuppressStartupBanner>
    1.90        <TargetEnvironment>X64</TargetEnvironment>
    1.91 -      <TypeLibraryName>.\Release/SDL.tlb</TypeLibraryName>
    1.92      </Midl>
    1.93      <ClCompile>
    1.94        <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
    1.95 @@ -201,7 +194,6 @@
    1.96      </ResourceCompile>
    1.97      <Link>
    1.98        <AdditionalDependencies>winmm.lib;imm32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
    1.99 -      <OutputFile>$(IntDir)SDL.dll</OutputFile>
   1.100        <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
   1.101        <SubSystem>Windows</SubSystem>
   1.102      </Link>
   1.103 @@ -444,4 +436,4 @@
   1.104    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   1.105    <ImportGroup Label="ExtensionTargets">
   1.106    </ImportGroup>
   1.107 -</Project>
   1.108 +</Project>
   1.109 \ No newline at end of file
     2.1 --- a/VisualC/SDL_VS2010.sln	Tue Apr 19 08:08:50 2011 -0700
     2.2 +++ b/VisualC/SDL_VS2010.sln	Tue Apr 19 09:53:01 2011 -0700
     2.3 @@ -157,140 +157,162 @@
     2.4  		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.Build.0 = Release|x64
     2.5  		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.ActiveCfg = Debug|Win32
     2.6  		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.Build.0 = Debug|Win32
     2.7 -		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.ActiveCfg = Debug|Win32
     2.8 -		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.Build.0 = Debug|Win32
     2.9 +		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.ActiveCfg = Debug|x64
    2.10 +		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.Build.0 = Debug|x64
    2.11  		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.ActiveCfg = Release|Win32
    2.12  		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.Build.0 = Release|Win32
    2.13  		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.ActiveCfg = Release|x64
    2.14  		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.Build.0 = Release|x64
    2.15  		{DDD710DB-EC7B-4CCB-BD75-535D401A2FE0}.Debug|Win32.ActiveCfg = Debug|Win32
    2.16  		{DDD710DB-EC7B-4CCB-BD75-535D401A2FE0}.Debug|Win32.Build.0 = Debug|Win32
    2.17 -		{DDD710DB-EC7B-4CCB-BD75-535D401A2FE0}.Debug|x64.ActiveCfg = Debug|Win32
    2.18 +		{DDD710DB-EC7B-4CCB-BD75-535D401A2FE0}.Debug|x64.ActiveCfg = Debug|x64
    2.19 +		{DDD710DB-EC7B-4CCB-BD75-535D401A2FE0}.Debug|x64.Build.0 = Debug|x64
    2.20  		{DDD710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|Win32.ActiveCfg = Release|Win32
    2.21  		{DDD710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|Win32.Build.0 = Release|Win32
    2.22  		{DDD710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|x64.ActiveCfg = Release|Win32
    2.23  		{0BCCA0BF-073E-439E-BCE0-C9353C177487}.Debug|Win32.ActiveCfg = Debug|Win32
    2.24  		{0BCCA0BF-073E-439E-BCE0-C9353C177487}.Debug|Win32.Build.0 = Debug|Win32
    2.25 -		{0BCCA0BF-073E-439E-BCE0-C9353C177487}.Debug|x64.ActiveCfg = Debug|Win32
    2.26 +		{0BCCA0BF-073E-439E-BCE0-C9353C177487}.Debug|x64.ActiveCfg = Debug|x64
    2.27 +		{0BCCA0BF-073E-439E-BCE0-C9353C177487}.Debug|x64.Build.0 = Debug|x64
    2.28  		{0BCCA0BF-073E-439E-BCE0-C9353C177487}.Release|Win32.ActiveCfg = Release|Win32
    2.29  		{0BCCA0BF-073E-439E-BCE0-C9353C177487}.Release|Win32.Build.0 = Release|Win32
    2.30  		{0BCCA0BF-073E-439E-BCE0-C9353C177487}.Release|x64.ActiveCfg = Release|Win32
    2.31  		{AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug|Win32.ActiveCfg = Debug|Win32
    2.32  		{AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug|Win32.Build.0 = Debug|Win32
    2.33 -		{AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug|x64.ActiveCfg = Debug|Win32
    2.34 +		{AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug|x64.ActiveCfg = Debug|x64
    2.35 +		{AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug|x64.Build.0 = Debug|x64
    2.36  		{AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release|Win32.ActiveCfg = Release|Win32
    2.37  		{AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release|Win32.Build.0 = Release|Win32
    2.38  		{AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release|x64.ActiveCfg = Release|Win32
    2.39  		{7814D54B-65D3-4677-AD77-E0B980B4FA2D}.Debug|Win32.ActiveCfg = Debug|Win32
    2.40  		{7814D54B-65D3-4677-AD77-E0B980B4FA2D}.Debug|Win32.Build.0 = Debug|Win32
    2.41 -		{7814D54B-65D3-4677-AD77-E0B980B4FA2D}.Debug|x64.ActiveCfg = Debug|Win32
    2.42 +		{7814D54B-65D3-4677-AD77-E0B980B4FA2D}.Debug|x64.ActiveCfg = Debug|x64
    2.43 +		{7814D54B-65D3-4677-AD77-E0B980B4FA2D}.Debug|x64.Build.0 = Debug|x64
    2.44  		{7814D54B-65D3-4677-AD77-E0B980B4FA2D}.Release|Win32.ActiveCfg = Release|Win32
    2.45  		{7814D54B-65D3-4677-AD77-E0B980B4FA2D}.Release|Win32.Build.0 = Release|Win32
    2.46  		{7814D54B-65D3-4677-AD77-E0B980B4FA2D}.Release|x64.ActiveCfg = Release|Win32
    2.47  		{D974A0DF-3E2E-445C-A2EB-E899E9B582CB}.Debug|Win32.ActiveCfg = Debug|Win32
    2.48  		{D974A0DF-3E2E-445C-A2EB-E899E9B582CB}.Debug|Win32.Build.0 = Debug|Win32
    2.49 -		{D974A0DF-3E2E-445C-A2EB-E899E9B582CB}.Debug|x64.ActiveCfg = Debug|Win32
    2.50 +		{D974A0DF-3E2E-445C-A2EB-E899E9B582CB}.Debug|x64.ActiveCfg = Debug|x64
    2.51 +		{D974A0DF-3E2E-445C-A2EB-E899E9B582CB}.Debug|x64.Build.0 = Debug|x64
    2.52  		{D974A0DF-3E2E-445C-A2EB-E899E9B582CB}.Release|Win32.ActiveCfg = Release|Win32
    2.53  		{D974A0DF-3E2E-445C-A2EB-E899E9B582CB}.Release|Win32.Build.0 = Release|Win32
    2.54  		{D974A0DF-3E2E-445C-A2EB-E899E9B582CB}.Release|x64.ActiveCfg = Release|Win32
    2.55  		{272D976B-A1DF-4DEB-BD7F-5C0D330E0C7D}.Debug|Win32.ActiveCfg = Debug|Win32
    2.56  		{272D976B-A1DF-4DEB-BD7F-5C0D330E0C7D}.Debug|Win32.Build.0 = Debug|Win32
    2.57 -		{272D976B-A1DF-4DEB-BD7F-5C0D330E0C7D}.Debug|x64.ActiveCfg = Debug|Win32
    2.58 +		{272D976B-A1DF-4DEB-BD7F-5C0D330E0C7D}.Debug|x64.ActiveCfg = Debug|x64
    2.59 +		{272D976B-A1DF-4DEB-BD7F-5C0D330E0C7D}.Debug|x64.Build.0 = Debug|x64
    2.60  		{272D976B-A1DF-4DEB-BD7F-5C0D330E0C7D}.Release|Win32.ActiveCfg = Release|Win32
    2.61  		{272D976B-A1DF-4DEB-BD7F-5C0D330E0C7D}.Release|Win32.Build.0 = Release|Win32
    2.62  		{272D976B-A1DF-4DEB-BD7F-5C0D330E0C7D}.Release|x64.ActiveCfg = Release|Win32
    2.63  		{55812185-D13C-4022-9C81-32E0F4A08304}.Debug|Win32.ActiveCfg = Debug|Win32
    2.64  		{55812185-D13C-4022-9C81-32E0F4A08304}.Debug|Win32.Build.0 = Debug|Win32
    2.65 -		{55812185-D13C-4022-9C81-32E0F4A08304}.Debug|x64.ActiveCfg = Debug|Win32
    2.66 +		{55812185-D13C-4022-9C81-32E0F4A08304}.Debug|x64.ActiveCfg = Debug|x64
    2.67 +		{55812185-D13C-4022-9C81-32E0F4A08304}.Debug|x64.Build.0 = Debug|x64
    2.68  		{55812185-D13C-4022-9C81-32E0F4A08304}.Release|Win32.ActiveCfg = Release|Win32
    2.69  		{55812185-D13C-4022-9C81-32E0F4A08304}.Release|Win32.Build.0 = Release|Win32
    2.70  		{55812185-D13C-4022-9C81-32E0F4A08304}.Release|x64.ActiveCfg = Release|Win32
    2.71  		{575FD095-EDAB-4BD4-B733-CD4A874F6FB0}.Debug|Win32.ActiveCfg = Debug|Win32
    2.72  		{575FD095-EDAB-4BD4-B733-CD4A874F6FB0}.Debug|Win32.Build.0 = Debug|Win32
    2.73 -		{575FD095-EDAB-4BD4-B733-CD4A874F6FB0}.Debug|x64.ActiveCfg = Debug|Win32
    2.74 +		{575FD095-EDAB-4BD4-B733-CD4A874F6FB0}.Debug|x64.ActiveCfg = Debug|x64
    2.75 +		{575FD095-EDAB-4BD4-B733-CD4A874F6FB0}.Debug|x64.Build.0 = Debug|x64
    2.76  		{575FD095-EDAB-4BD4-B733-CD4A874F6FB0}.Release|Win32.ActiveCfg = Release|Win32
    2.77  		{575FD095-EDAB-4BD4-B733-CD4A874F6FB0}.Release|Win32.Build.0 = Release|Win32
    2.78  		{575FD095-EDAB-4BD4-B733-CD4A874F6FB0}.Release|x64.ActiveCfg = Release|Win32
    2.79  		{0FFD1A21-11DB-492C-A989-E4F195B0C441}.Debug|Win32.ActiveCfg = Debug|Win32
    2.80  		{0FFD1A21-11DB-492C-A989-E4F195B0C441}.Debug|Win32.Build.0 = Debug|Win32
    2.81 -		{0FFD1A21-11DB-492C-A989-E4F195B0C441}.Debug|x64.ActiveCfg = Debug|Win32
    2.82 +		{0FFD1A21-11DB-492C-A989-E4F195B0C441}.Debug|x64.ActiveCfg = Debug|x64
    2.83 +		{0FFD1A21-11DB-492C-A989-E4F195B0C441}.Debug|x64.Build.0 = Debug|x64
    2.84  		{0FFD1A21-11DB-492C-A989-E4F195B0C441}.Release|Win32.ActiveCfg = Release|Win32
    2.85  		{0FFD1A21-11DB-492C-A989-E4F195B0C441}.Release|Win32.Build.0 = Release|Win32
    2.86  		{0FFD1A21-11DB-492C-A989-E4F195B0C441}.Release|x64.ActiveCfg = Release|Win32
    2.87  		{6AF0724B-BAC1-4C9D-AFBF-F63B4A2FB8FB}.Debug|Win32.ActiveCfg = Debug|Win32
    2.88  		{6AF0724B-BAC1-4C9D-AFBF-F63B4A2FB8FB}.Debug|Win32.Build.0 = Debug|Win32
    2.89 -		{6AF0724B-BAC1-4C9D-AFBF-F63B4A2FB8FB}.Debug|x64.ActiveCfg = Debug|Win32
    2.90 +		{6AF0724B-BAC1-4C9D-AFBF-F63B4A2FB8FB}.Debug|x64.ActiveCfg = Debug|x64
    2.91 +		{6AF0724B-BAC1-4C9D-AFBF-F63B4A2FB8FB}.Debug|x64.Build.0 = Debug|x64
    2.92  		{6AF0724B-BAC1-4C9D-AFBF-F63B4A2FB8FB}.Release|Win32.ActiveCfg = Release|Win32
    2.93  		{6AF0724B-BAC1-4C9D-AFBF-F63B4A2FB8FB}.Release|Win32.Build.0 = Release|Win32
    2.94  		{6AF0724B-BAC1-4C9D-AFBF-F63B4A2FB8FB}.Release|x64.ActiveCfg = Release|Win32
    2.95  		{26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug|Win32.ActiveCfg = Debug|Win32
    2.96  		{26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug|Win32.Build.0 = Debug|Win32
    2.97 -		{26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug|x64.ActiveCfg = Debug|Win32
    2.98 +		{26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug|x64.ActiveCfg = Debug|x64
    2.99 +		{26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug|x64.Build.0 = Debug|x64
   2.100  		{26932B24-EFC6-4E3A-B277-ED653DA37968}.Release|Win32.ActiveCfg = Release|Win32
   2.101  		{26932B24-EFC6-4E3A-B277-ED653DA37968}.Release|Win32.Build.0 = Release|Win32
   2.102  		{26932B24-EFC6-4E3A-B277-ED653DA37968}.Release|x64.ActiveCfg = Release|Win32
   2.103  		{CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug|Win32.ActiveCfg = Debug|Win32
   2.104  		{CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug|Win32.Build.0 = Debug|Win32
   2.105 -		{CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug|x64.ActiveCfg = Debug|Win32
   2.106 +		{CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug|x64.ActiveCfg = Debug|x64
   2.107 +		{CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug|x64.Build.0 = Debug|x64
   2.108  		{CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release|Win32.ActiveCfg = Release|Win32
   2.109  		{CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release|Win32.Build.0 = Release|Win32
   2.110  		{CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release|x64.ActiveCfg = Release|Win32
   2.111  		{8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug|Win32.ActiveCfg = Debug|Win32
   2.112  		{8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug|Win32.Build.0 = Debug|Win32
   2.113 -		{8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug|x64.ActiveCfg = Debug|Win32
   2.114 +		{8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug|x64.ActiveCfg = Debug|x64
   2.115 +		{8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug|x64.Build.0 = Debug|x64
   2.116  		{8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release|Win32.ActiveCfg = Release|Win32
   2.117  		{8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release|Win32.Build.0 = Release|Win32
   2.118  		{8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release|x64.ActiveCfg = Release|Win32
   2.119  		{26828762-C95D-4637-9CB1-7F0979523813}.Debug|Win32.ActiveCfg = Debug|Win32
   2.120  		{26828762-C95D-4637-9CB1-7F0979523813}.Debug|Win32.Build.0 = Debug|Win32
   2.121 -		{26828762-C95D-4637-9CB1-7F0979523813}.Debug|x64.ActiveCfg = Debug|Win32
   2.122 +		{26828762-C95D-4637-9CB1-7F0979523813}.Debug|x64.ActiveCfg = Debug|x64
   2.123 +		{26828762-C95D-4637-9CB1-7F0979523813}.Debug|x64.Build.0 = Debug|x64
   2.124  		{26828762-C95D-4637-9CB1-7F0979523813}.Release|Win32.ActiveCfg = Release|Win32
   2.125  		{26828762-C95D-4637-9CB1-7F0979523813}.Release|Win32.Build.0 = Release|Win32
   2.126  		{26828762-C95D-4637-9CB1-7F0979523813}.Release|x64.ActiveCfg = Release|Win32
   2.127  		{9E320A14-B443-4DD7-8725-B7020DCFF730}.Debug|Win32.ActiveCfg = Debug|Win32
   2.128  		{9E320A14-B443-4DD7-8725-B7020DCFF730}.Debug|Win32.Build.0 = Debug|Win32
   2.129 -		{9E320A14-B443-4DD7-8725-B7020DCFF730}.Debug|x64.ActiveCfg = Debug|Win32
   2.130 +		{9E320A14-B443-4DD7-8725-B7020DCFF730}.Debug|x64.ActiveCfg = Debug|x64
   2.131 +		{9E320A14-B443-4DD7-8725-B7020DCFF730}.Debug|x64.Build.0 = Debug|x64
   2.132  		{9E320A14-B443-4DD7-8725-B7020DCFF730}.Release|Win32.ActiveCfg = Release|Win32
   2.133  		{9E320A14-B443-4DD7-8725-B7020DCFF730}.Release|Win32.Build.0 = Release|Win32
   2.134  		{9E320A14-B443-4DD7-8725-B7020DCFF730}.Release|x64.ActiveCfg = Release|Win32
   2.135  		{B51E0D74-F0A2-45A2-BD2A-8B7D95B8204A}.Debug|Win32.ActiveCfg = Debug|Win32
   2.136  		{B51E0D74-F0A2-45A2-BD2A-8B7D95B8204A}.Debug|Win32.Build.0 = Debug|Win32
   2.137 -		{B51E0D74-F0A2-45A2-BD2A-8B7D95B8204A}.Debug|x64.ActiveCfg = Debug|Win32
   2.138 +		{B51E0D74-F0A2-45A2-BD2A-8B7D95B8204A}.Debug|x64.ActiveCfg = Debug|x64
   2.139 +		{B51E0D74-F0A2-45A2-BD2A-8B7D95B8204A}.Debug|x64.Build.0 = Debug|x64
   2.140  		{B51E0D74-F0A2-45A2-BD2A-8B7D95B8204A}.Release|Win32.ActiveCfg = Release|Win32
   2.141  		{B51E0D74-F0A2-45A2-BD2A-8B7D95B8204A}.Release|Win32.Build.0 = Release|Win32
   2.142  		{B51E0D74-F0A2-45A2-BD2A-8B7D95B8204A}.Release|x64.ActiveCfg = Release|Win32
   2.143  		{5D0930C0-7C91-4ECE-9014-7B7DDE9502E5}.Debug|Win32.ActiveCfg = Debug|Win32
   2.144  		{5D0930C0-7C91-4ECE-9014-7B7DDE9502E5}.Debug|Win32.Build.0 = Debug|Win32
   2.145 -		{5D0930C0-7C91-4ECE-9014-7B7DDE9502E5}.Debug|x64.ActiveCfg = Debug|Win32
   2.146 +		{5D0930C0-7C91-4ECE-9014-7B7DDE9502E5}.Debug|x64.ActiveCfg = Debug|x64
   2.147 +		{5D0930C0-7C91-4ECE-9014-7B7DDE9502E5}.Debug|x64.Build.0 = Debug|x64
   2.148  		{5D0930C0-7C91-4ECE-9014-7B7DDE9502E5}.Release|Win32.ActiveCfg = Release|Win32
   2.149  		{5D0930C0-7C91-4ECE-9014-7B7DDE9502E5}.Release|Win32.Build.0 = Release|Win32
   2.150  		{5D0930C0-7C91-4ECE-9014-7B7DDE9502E5}.Release|x64.ActiveCfg = Release|Win32
   2.151  		{40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|Win32.ActiveCfg = Debug|Win32
   2.152  		{40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|Win32.Build.0 = Debug|Win32
   2.153 -		{40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|x64.ActiveCfg = Debug|Win32
   2.154 +		{40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|x64.ActiveCfg = Debug|x64
   2.155 +		{40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|x64.Build.0 = Debug|x64
   2.156  		{40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release|Win32.ActiveCfg = Release|Win32
   2.157  		{40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release|Win32.Build.0 = Release|Win32
   2.158  		{40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release|x64.ActiveCfg = Release|Win32
   2.159  		{EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Debug|Win32.ActiveCfg = Debug|Win32
   2.160  		{EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Debug|Win32.Build.0 = Debug|Win32
   2.161 -		{EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Debug|x64.ActiveCfg = Debug|Win32
   2.162 +		{EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Debug|x64.ActiveCfg = Debug|x64
   2.163 +		{EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Debug|x64.Build.0 = Debug|x64
   2.164  		{EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Release|Win32.ActiveCfg = Release|Win32
   2.165  		{EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Release|x64.ActiveCfg = Release|Win32
   2.166  		{8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug|Win32.ActiveCfg = Debug|Win32
   2.167  		{8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug|Win32.Build.0 = Debug|Win32
   2.168 -		{8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug|x64.ActiveCfg = Debug|Win32
   2.169 +		{8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug|x64.ActiveCfg = Debug|x64
   2.170 +		{8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug|x64.Build.0 = Debug|x64
   2.171  		{8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release|Win32.ActiveCfg = Release|Win32
   2.172  		{8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release|Win32.Build.0 = Release|Win32
   2.173  		{8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release|x64.ActiveCfg = Release|Win32
   2.174  		{C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug|Win32.ActiveCfg = Debug|Win32
   2.175  		{C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug|Win32.Build.0 = Debug|Win32
   2.176 -		{C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug|x64.ActiveCfg = Debug|Win32
   2.177 +		{C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug|x64.ActiveCfg = Debug|x64
   2.178 +		{C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug|x64.Build.0 = Debug|x64
   2.179  		{C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release|Win32.ActiveCfg = Release|Win32
   2.180  		{C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release|Win32.Build.0 = Release|Win32
   2.181  		{C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release|x64.ActiveCfg = Release|Win32
   2.182  		{20839E82-6F23-429D-91D7-8A2601BC7EA8}.Debug|Win32.ActiveCfg = Debug|Win32
   2.183  		{20839E82-6F23-429D-91D7-8A2601BC7EA8}.Debug|Win32.Build.0 = Debug|Win32
   2.184 -		{20839E82-6F23-429D-91D7-8A2601BC7EA8}.Debug|x64.ActiveCfg = Debug|Win32
   2.185 +		{20839E82-6F23-429D-91D7-8A2601BC7EA8}.Debug|x64.ActiveCfg = Debug|x64
   2.186 +		{20839E82-6F23-429D-91D7-8A2601BC7EA8}.Debug|x64.Build.0 = Debug|x64
   2.187  		{20839E82-6F23-429D-91D7-8A2601BC7EA8}.Release|Win32.ActiveCfg = Release|Win32
   2.188  		{20839E82-6F23-429D-91D7-8A2601BC7EA8}.Release|Win32.Build.0 = Release|Win32
   2.189  		{20839E82-6F23-429D-91D7-8A2601BC7EA8}.Release|x64.ActiveCfg = Release|Win32
     3.1 --- a/VisualC/SDLmain/SDLmain_VS2010.vcxproj	Tue Apr 19 08:08:50 2011 -0700
     3.2 +++ b/VisualC/SDLmain/SDLmain_VS2010.vcxproj	Tue Apr 19 09:53:01 2011 -0700
     3.3 @@ -34,6 +34,7 @@
     3.4    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     3.5      <ConfigurationType>StaticLibrary</ConfigurationType>
     3.6      <UseOfMfc>false</UseOfMfc>
     3.7 +    <CharacterSet>MultiByte</CharacterSet>
     3.8    </PropertyGroup>
     3.9    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    3.10      <ConfigurationType>StaticLibrary</ConfigurationType>
    3.11 @@ -61,12 +62,12 @@
    3.12    <PropertyGroup Label="UserMacros" />
    3.13    <PropertyGroup>
    3.14      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    3.15 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
    3.16 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
    3.17 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
    3.18 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    3.19      <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
    3.20      <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    3.21 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
    3.22 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
    3.23 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
    3.24 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    3.25      <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
    3.26      <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    3.27    </PropertyGroup>
    3.28 @@ -86,7 +87,6 @@
    3.29        <CompileAs>Default</CompileAs>
    3.30      </ClCompile>
    3.31      <Lib>
    3.32 -      <OutputFile>.\Release\SDLmain.lib</OutputFile>
    3.33        <SuppressStartupBanner>true</SuppressStartupBanner>
    3.34      </Lib>
    3.35    </ItemDefinitionGroup>
    3.36 @@ -103,13 +103,12 @@
    3.37        <FunctionLevelLinking>true</FunctionLevelLinking>
    3.38        <PrecompiledHeader>
    3.39        </PrecompiledHeader>
    3.40 -      <PrecompiledHeaderOutputFile>.\Release/SDLmain.pch</PrecompiledHeaderOutputFile>
    3.41        <WarningLevel>Level3</WarningLevel>
    3.42        <SuppressStartupBanner>true</SuppressStartupBanner>
    3.43        <CompileAs>Default</CompileAs>
    3.44      </ClCompile>
    3.45      <Lib>
    3.46 -      <OutputFile>$(IntDir)SDLmain.lib</OutputFile>
    3.47 +      <SuppressStartupBanner>true</SuppressStartupBanner>
    3.48      </Lib>
    3.49    </ItemDefinitionGroup>
    3.50    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    3.51 @@ -127,7 +126,6 @@
    3.52        <CompileAs>Default</CompileAs>
    3.53      </ClCompile>
    3.54      <Lib>
    3.55 -      <OutputFile>.\Debug\SDLmain.lib</OutputFile>
    3.56        <SuppressStartupBanner>true</SuppressStartupBanner>
    3.57      </Lib>
    3.58    </ItemDefinitionGroup>
    3.59 @@ -139,7 +137,7 @@
    3.60        <Optimization>Disabled</Optimization>
    3.61        <AdditionalIncludeDirectories>..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    3.62        <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    3.63 -      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    3.64 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    3.65        <PrecompiledHeader>
    3.66        </PrecompiledHeader>
    3.67        <PrecompiledHeaderOutputFile>.\Debug/SDLmain.pch</PrecompiledHeaderOutputFile>
    3.68 @@ -149,7 +147,7 @@
    3.69        <CompileAs>Default</CompileAs>
    3.70      </ClCompile>
    3.71      <Lib>
    3.72 -      <OutputFile>$(IntDir)SDLmain.lib</OutputFile>
    3.73 +      <SuppressStartupBanner>true</SuppressStartupBanner>
    3.74      </Lib>
    3.75    </ItemDefinitionGroup>
    3.76    <ItemGroup>
     4.1 --- a/VisualC/tests/automated/automated_VS2010.vcxproj	Tue Apr 19 08:08:50 2011 -0700
     4.2 +++ b/VisualC/tests/automated/automated_VS2010.vcxproj	Tue Apr 19 09:53:01 2011 -0700
     4.3 @@ -5,10 +5,18 @@
     4.4        <Configuration>Debug</Configuration>
     4.5        <Platform>Win32</Platform>
     4.6      </ProjectConfiguration>
     4.7 +    <ProjectConfiguration Include="Debug|x64">
     4.8 +      <Configuration>Debug</Configuration>
     4.9 +      <Platform>x64</Platform>
    4.10 +    </ProjectConfiguration>
    4.11      <ProjectConfiguration Include="Release|Win32">
    4.12        <Configuration>Release</Configuration>
    4.13        <Platform>Win32</Platform>
    4.14      </ProjectConfiguration>
    4.15 +    <ProjectConfiguration Include="Release|x64">
    4.16 +      <Configuration>Release</Configuration>
    4.17 +      <Platform>x64</Platform>
    4.18 +    </ProjectConfiguration>
    4.19    </ItemGroup>
    4.20    <PropertyGroup Label="Globals">
    4.21      <ProjectName>automated</ProjectName>
    4.22 @@ -22,33 +30,54 @@
    4.23      <CharacterSet>Unicode</CharacterSet>
    4.24      <WholeProgramOptimization>true</WholeProgramOptimization>
    4.25    </PropertyGroup>
    4.26 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    4.27 +    <ConfigurationType>Application</ConfigurationType>
    4.28 +    <CharacterSet>Unicode</CharacterSet>
    4.29 +    <WholeProgramOptimization>true</WholeProgramOptimization>
    4.30 +  </PropertyGroup>
    4.31    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    4.32      <ConfigurationType>Application</ConfigurationType>
    4.33      <CharacterSet>Unicode</CharacterSet>
    4.34    </PropertyGroup>
    4.35 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    4.36 +    <ConfigurationType>Application</ConfigurationType>
    4.37 +    <CharacterSet>MultiByte</CharacterSet>
    4.38 +  </PropertyGroup>
    4.39    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    4.40    <ImportGroup Label="ExtensionSettings">
    4.41    </ImportGroup>
    4.42    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    4.43      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    4.44    </ImportGroup>
    4.45 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    4.46 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    4.47 +  </ImportGroup>
    4.48    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    4.49      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    4.50    </ImportGroup>
    4.51 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    4.52 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    4.53 +  </ImportGroup>
    4.54    <PropertyGroup Label="UserMacros" />
    4.55    <PropertyGroup>
    4.56      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    4.57 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
    4.58 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
    4.59 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
    4.60 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
    4.61 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    4.62 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    4.63      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
    4.64 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
    4.65 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
    4.66 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    4.67 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
    4.68 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
    4.69 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    4.70 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    4.71      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    4.72 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    4.73    </PropertyGroup>
    4.74    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    4.75      <ClCompile>
    4.76        <Optimization>Disabled</Optimization>
    4.77 -      <AdditionalIncludeDirectories>$(SolutionDir)\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    4.78 +      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    4.79        <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    4.80        <MinimalRebuild>true</MinimalRebuild>
    4.81        <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    4.82 @@ -64,11 +93,34 @@
    4.83        <TargetMachine>MachineX86</TargetMachine>
    4.84      </Link>
    4.85    </ItemDefinitionGroup>
    4.86 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    4.87 +    <ClCompile>
    4.88 +      <Optimization>Disabled</Optimization>
    4.89 +      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    4.90 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    4.91 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    4.92 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    4.93 +      <PrecompiledHeader>
    4.94 +      </PrecompiledHeader>
    4.95 +      <WarningLevel>Level3</WarningLevel>
    4.96 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    4.97 +    </ClCompile>
    4.98 +    <Link>
    4.99 +      <GenerateDebugInformation>true</GenerateDebugInformation>
   4.100 +      <SubSystem>Windows</SubSystem>
   4.101 +    </Link>
   4.102 +    <PostBuildEvent>
   4.103 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
   4.104 +    </PostBuildEvent>
   4.105 +    <PostBuildEvent>
   4.106 +      <Message>Copy SDL</Message>
   4.107 +    </PostBuildEvent>
   4.108 +  </ItemDefinitionGroup>
   4.109    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   4.110      <ClCompile>
   4.111        <Optimization>MaxSpeed</Optimization>
   4.112        <IntrinsicFunctions>true</IntrinsicFunctions>
   4.113 -      <AdditionalIncludeDirectories>$(SolutionDir)\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   4.114 +      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   4.115        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   4.116        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   4.117        <FunctionLevelLinking>true</FunctionLevelLinking>
   4.118 @@ -85,6 +137,26 @@
   4.119        <TargetMachine>MachineX86</TargetMachine>
   4.120      </Link>
   4.121    </ItemDefinitionGroup>
   4.122 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
   4.123 +    <ClCompile>
   4.124 +      <Optimization>MaxSpeed</Optimization>
   4.125 +      <IntrinsicFunctions>true</IntrinsicFunctions>
   4.126 +      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   4.127 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   4.128 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   4.129 +      <FunctionLevelLinking>true</FunctionLevelLinking>
   4.130 +      <PrecompiledHeader>
   4.131 +      </PrecompiledHeader>
   4.132 +      <WarningLevel>Level3</WarningLevel>
   4.133 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
   4.134 +    </ClCompile>
   4.135 +    <Link>
   4.136 +      <GenerateDebugInformation>true</GenerateDebugInformation>
   4.137 +      <SubSystem>Windows</SubSystem>
   4.138 +      <OptimizeReferences>true</OptimizeReferences>
   4.139 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
   4.140 +    </Link>
   4.141 +  </ItemDefinitionGroup>
   4.142    <ItemGroup>
   4.143      <ClCompile Include="..\..\..\test\automated\audio\audio.c" />
   4.144      <ClCompile Include="..\..\..\test\automated\common\common.c" />
   4.145 @@ -108,17 +180,8 @@
   4.146      <ClInclude Include="..\..\..\test\automated\surface\surface.h" />
   4.147    </ItemGroup>
   4.148    <ItemGroup>
   4.149 -    <ProjectReference Include="..\..\SDLmain\SDLmain_VS2010.vcxproj">
   4.150 -      <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
   4.151 -      <Private>false</Private>
   4.152 -      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
   4.153 -      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
   4.154 -      <LinkLibraryDependencies>true</LinkLibraryDependencies>
   4.155 -      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
   4.156 -    </ProjectReference>
   4.157 -    <ProjectReference Include="..\..\SDL\SDL_VS2010.vcxproj">
   4.158 -      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
   4.159 -    </ProjectReference>
   4.160 +    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
   4.161 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
   4.162    </ItemGroup>
   4.163    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   4.164    <ImportGroup Label="ExtensionTargets">
     5.1 --- a/VisualC/tests/checkkeys/checkkeys_VS2010.vcxproj	Tue Apr 19 08:08:50 2011 -0700
     5.2 +++ b/VisualC/tests/checkkeys/checkkeys_VS2010.vcxproj	Tue Apr 19 09:53:01 2011 -0700
     5.3 @@ -5,10 +5,18 @@
     5.4        <Configuration>Debug</Configuration>
     5.5        <Platform>Win32</Platform>
     5.6      </ProjectConfiguration>
     5.7 +    <ProjectConfiguration Include="Debug|x64">
     5.8 +      <Configuration>Debug</Configuration>
     5.9 +      <Platform>x64</Platform>
    5.10 +    </ProjectConfiguration>
    5.11      <ProjectConfiguration Include="Release|Win32">
    5.12        <Configuration>Release</Configuration>
    5.13        <Platform>Win32</Platform>
    5.14      </ProjectConfiguration>
    5.15 +    <ProjectConfiguration Include="Release|x64">
    5.16 +      <Configuration>Release</Configuration>
    5.17 +      <Platform>x64</Platform>
    5.18 +    </ProjectConfiguration>
    5.19    </ItemGroup>
    5.20    <PropertyGroup Label="Globals">
    5.21      <ProjectName>checkkeys</ProjectName>
    5.22 @@ -20,10 +28,19 @@
    5.23      <ConfigurationType>Application</ConfigurationType>
    5.24      <UseOfMfc>false</UseOfMfc>
    5.25    </PropertyGroup>
    5.26 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    5.27 +    <ConfigurationType>Application</ConfigurationType>
    5.28 +    <UseOfMfc>false</UseOfMfc>
    5.29 +  </PropertyGroup>
    5.30    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    5.31      <ConfigurationType>Application</ConfigurationType>
    5.32      <UseOfMfc>false</UseOfMfc>
    5.33    </PropertyGroup>
    5.34 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    5.35 +    <ConfigurationType>Application</ConfigurationType>
    5.36 +    <UseOfMfc>false</UseOfMfc>
    5.37 +    <CharacterSet>MultiByte</CharacterSet>
    5.38 +  </PropertyGroup>
    5.39    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    5.40    <ImportGroup Label="ExtensionSettings">
    5.41    </ImportGroup>
    5.42 @@ -31,19 +48,33 @@
    5.43      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5.44      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    5.45    </ImportGroup>
    5.46 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    5.47 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5.48 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    5.49 +  </ImportGroup>
    5.50    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    5.51      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5.52      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    5.53    </ImportGroup>
    5.54 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    5.55 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5.56 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    5.57 +  </ImportGroup>
    5.58    <PropertyGroup Label="UserMacros" />
    5.59    <PropertyGroup>
    5.60      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    5.61 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
    5.62 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
    5.63 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
    5.64 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
    5.65 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    5.66 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    5.67      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
    5.68 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
    5.69 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
    5.70 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    5.71 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
    5.72 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
    5.73 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    5.74 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    5.75      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    5.76 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    5.77    </PropertyGroup>
    5.78    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    5.79      <Midl>
    5.80 @@ -51,7 +82,6 @@
    5.81        <MkTypLibCompatible>true</MkTypLibCompatible>
    5.82        <SuppressStartupBanner>true</SuppressStartupBanner>
    5.83        <TargetEnvironment>Win32</TargetEnvironment>
    5.84 -      <TypeLibraryName>.\Debug/checkkeys.tlb</TypeLibraryName>
    5.85      </Midl>
    5.86      <ClCompile>
    5.87        <Optimization>Disabled</Optimization>
    5.88 @@ -60,10 +90,6 @@
    5.89        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    5.90        <PrecompiledHeader>
    5.91        </PrecompiledHeader>
    5.92 -      <PrecompiledHeaderOutputFile>.\Debug/checkkeys.pch</PrecompiledHeaderOutputFile>
    5.93 -      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
    5.94 -      <ObjectFileName>.\Debug/</ObjectFileName>
    5.95 -      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
    5.96        <WarningLevel>Level3</WarningLevel>
    5.97        <SuppressStartupBanner>true</SuppressStartupBanner>
    5.98        <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    5.99 @@ -74,15 +100,46 @@
   5.100        <Culture>0x0409</Culture>
   5.101      </ResourceCompile>
   5.102      <Link>
   5.103 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
   5.104 -      <OutputFile>.\Debug/checkkeys.exe</OutputFile>
   5.105        <SuppressStartupBanner>true</SuppressStartupBanner>
   5.106        <GenerateDebugInformation>true</GenerateDebugInformation>
   5.107 -      <ProgramDatabaseFile>.\Debug/checkkeys.pdb</ProgramDatabaseFile>
   5.108        <SubSystem>Windows</SubSystem>
   5.109      </Link>
   5.110      <PostBuildEvent>
   5.111 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll</Command>
   5.112 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
   5.113 +    </PostBuildEvent>
   5.114 +    <PostBuildEvent>
   5.115 +      <Message>Copy SDL</Message>
   5.116 +    </PostBuildEvent>
   5.117 +  </ItemDefinitionGroup>
   5.118 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
   5.119 +    <Midl>
   5.120 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   5.121 +      <MkTypLibCompatible>true</MkTypLibCompatible>
   5.122 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   5.123 +    </Midl>
   5.124 +    <ClCompile>
   5.125 +      <Optimization>Disabled</Optimization>
   5.126 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   5.127 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   5.128 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   5.129 +      <PrecompiledHeader>
   5.130 +      </PrecompiledHeader>
   5.131 +      <WarningLevel>Level3</WarningLevel>
   5.132 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   5.133 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
   5.134 +      <CompileAs>Default</CompileAs>
   5.135 +    </ClCompile>
   5.136 +    <ResourceCompile>
   5.137 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   5.138 +      <Culture>0x0409</Culture>
   5.139 +    </ResourceCompile>
   5.140 +    <Link>
   5.141 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   5.142 +      <GenerateDebugInformation>true</GenerateDebugInformation>
   5.143 +      <SubSystem>Windows</SubSystem>
   5.144 +    </Link>
   5.145 +    <PostBuildEvent>
   5.146 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
   5.147      </PostBuildEvent>
   5.148      <PostBuildEvent>
   5.149        <Message>Copy SDL</Message>
   5.150 @@ -94,7 +151,6 @@
   5.151        <MkTypLibCompatible>true</MkTypLibCompatible>
   5.152        <SuppressStartupBanner>true</SuppressStartupBanner>
   5.153        <TargetEnvironment>Win32</TargetEnvironment>
   5.154 -      <TypeLibraryName>.\Release/checkkeys.tlb</TypeLibraryName>
   5.155      </Midl>
   5.156      <ClCompile>
   5.157        <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
   5.158 @@ -105,10 +161,6 @@
   5.159        <FunctionLevelLinking>true</FunctionLevelLinking>
   5.160        <PrecompiledHeader>
   5.161        </PrecompiledHeader>
   5.162 -      <PrecompiledHeaderOutputFile>.\Release/checkkeys.pch</PrecompiledHeaderOutputFile>
   5.163 -      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
   5.164 -      <ObjectFileName>.\Release/</ObjectFileName>
   5.165 -      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
   5.166        <WarningLevel>Level3</WarningLevel>
   5.167        <SuppressStartupBanner>true</SuppressStartupBanner>
   5.168        <CompileAs>Default</CompileAs>
   5.169 @@ -118,14 +170,45 @@
   5.170        <Culture>0x0409</Culture>
   5.171      </ResourceCompile>
   5.172      <Link>
   5.173 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
   5.174 -      <OutputFile>.\Release/checkkeys.exe</OutputFile>
   5.175        <SuppressStartupBanner>true</SuppressStartupBanner>
   5.176 -      <ProgramDatabaseFile>.\Release/checkkeys.pdb</ProgramDatabaseFile>
   5.177        <SubSystem>Windows</SubSystem>
   5.178      </Link>
   5.179      <PostBuildEvent>
   5.180 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll</Command>
   5.181 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
   5.182 +    </PostBuildEvent>
   5.183 +    <PostBuildEvent>
   5.184 +      <Message>Copy SDL</Message>
   5.185 +    </PostBuildEvent>
   5.186 +  </ItemDefinitionGroup>
   5.187 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
   5.188 +    <Midl>
   5.189 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   5.190 +      <MkTypLibCompatible>true</MkTypLibCompatible>
   5.191 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   5.192 +    </Midl>
   5.193 +    <ClCompile>
   5.194 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
   5.195 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   5.196 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   5.197 +      <StringPooling>true</StringPooling>
   5.198 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   5.199 +      <FunctionLevelLinking>true</FunctionLevelLinking>
   5.200 +      <PrecompiledHeader>
   5.201 +      </PrecompiledHeader>
   5.202 +      <WarningLevel>Level3</WarningLevel>
   5.203 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   5.204 +      <CompileAs>Default</CompileAs>
   5.205 +    </ClCompile>
   5.206 +    <ResourceCompile>
   5.207 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   5.208 +      <Culture>0x0409</Culture>
   5.209 +    </ResourceCompile>
   5.210 +    <Link>
   5.211 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   5.212 +      <SubSystem>Windows</SubSystem>
   5.213 +    </Link>
   5.214 +    <PostBuildEvent>
   5.215 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
   5.216      </PostBuildEvent>
   5.217      <PostBuildEvent>
   5.218        <Message>Copy SDL</Message>
   5.219 @@ -135,8 +218,8 @@
   5.220      <ClCompile Include="..\..\..\test\checkkeys.c" />
   5.221    </ItemGroup>
   5.222    <ItemGroup>
   5.223 -    <Library Include="..\..\Sdl\Debug\SDL.lib" />
   5.224 -    <Library Include="..\..\SDLmain\Debug\SDLmain.lib" />
   5.225 +    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
   5.226 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
   5.227    </ItemGroup>
   5.228    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   5.229    <ImportGroup Label="ExtensionTargets">
     6.1 --- a/VisualC/tests/graywin/graywin_VS2010.vcxproj	Tue Apr 19 08:08:50 2011 -0700
     6.2 +++ b/VisualC/tests/graywin/graywin_VS2010.vcxproj	Tue Apr 19 09:53:01 2011 -0700
     6.3 @@ -5,10 +5,18 @@
     6.4        <Configuration>Debug</Configuration>
     6.5        <Platform>Win32</Platform>
     6.6      </ProjectConfiguration>
     6.7 +    <ProjectConfiguration Include="Debug|x64">
     6.8 +      <Configuration>Debug</Configuration>
     6.9 +      <Platform>x64</Platform>
    6.10 +    </ProjectConfiguration>
    6.11      <ProjectConfiguration Include="Release|Win32">
    6.12        <Configuration>Release</Configuration>
    6.13        <Platform>Win32</Platform>
    6.14      </ProjectConfiguration>
    6.15 +    <ProjectConfiguration Include="Release|x64">
    6.16 +      <Configuration>Release</Configuration>
    6.17 +      <Platform>x64</Platform>
    6.18 +    </ProjectConfiguration>
    6.19    </ItemGroup>
    6.20    <PropertyGroup Label="Globals">
    6.21      <ProjectName>graywin</ProjectName>
    6.22 @@ -20,10 +28,19 @@
    6.23      <ConfigurationType>Application</ConfigurationType>
    6.24      <UseOfMfc>false</UseOfMfc>
    6.25    </PropertyGroup>
    6.26 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    6.27 +    <ConfigurationType>Application</ConfigurationType>
    6.28 +    <UseOfMfc>false</UseOfMfc>
    6.29 +  </PropertyGroup>
    6.30    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    6.31      <ConfigurationType>Application</ConfigurationType>
    6.32      <UseOfMfc>false</UseOfMfc>
    6.33    </PropertyGroup>
    6.34 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    6.35 +    <ConfigurationType>Application</ConfigurationType>
    6.36 +    <UseOfMfc>false</UseOfMfc>
    6.37 +    <CharacterSet>MultiByte</CharacterSet>
    6.38 +  </PropertyGroup>
    6.39    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    6.40    <ImportGroup Label="ExtensionSettings">
    6.41    </ImportGroup>
    6.42 @@ -31,19 +48,33 @@
    6.43      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    6.44      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    6.45    </ImportGroup>
    6.46 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    6.47 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    6.48 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    6.49 +  </ImportGroup>
    6.50    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    6.51      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    6.52      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    6.53    </ImportGroup>
    6.54 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    6.55 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    6.56 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    6.57 +  </ImportGroup>
    6.58    <PropertyGroup Label="UserMacros" />
    6.59    <PropertyGroup>
    6.60      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    6.61 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
    6.62 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
    6.63 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
    6.64 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
    6.65 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    6.66 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    6.67      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
    6.68 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
    6.69 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
    6.70 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    6.71 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
    6.72 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
    6.73 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    6.74 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    6.75      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    6.76 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    6.77    </PropertyGroup>
    6.78    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    6.79      <Midl>
    6.80 @@ -51,7 +82,6 @@
    6.81        <MkTypLibCompatible>true</MkTypLibCompatible>
    6.82        <SuppressStartupBanner>true</SuppressStartupBanner>
    6.83        <TargetEnvironment>Win32</TargetEnvironment>
    6.84 -      <TypeLibraryName>.\Debug/graywin.tlb</TypeLibraryName>
    6.85      </Midl>
    6.86      <ClCompile>
    6.87        <Optimization>Disabled</Optimization>
    6.88 @@ -60,10 +90,6 @@
    6.89        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    6.90        <PrecompiledHeader>
    6.91        </PrecompiledHeader>
    6.92 -      <PrecompiledHeaderOutputFile>.\Debug/graywin.pch</PrecompiledHeaderOutputFile>
    6.93 -      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
    6.94 -      <ObjectFileName>.\Debug/</ObjectFileName>
    6.95 -      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
    6.96        <WarningLevel>Level3</WarningLevel>
    6.97        <SuppressStartupBanner>true</SuppressStartupBanner>
    6.98        <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    6.99 @@ -74,15 +100,46 @@
   6.100        <Culture>0x0409</Culture>
   6.101      </ResourceCompile>
   6.102      <Link>
   6.103 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
   6.104 -      <OutputFile>.\Debug/graywin.exe</OutputFile>
   6.105        <SuppressStartupBanner>true</SuppressStartupBanner>
   6.106        <GenerateDebugInformation>true</GenerateDebugInformation>
   6.107 -      <ProgramDatabaseFile>.\Debug/graywin.pdb</ProgramDatabaseFile>
   6.108        <SubSystem>Windows</SubSystem>
   6.109      </Link>
   6.110      <PostBuildEvent>
   6.111 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll</Command>
   6.112 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
   6.113 +    </PostBuildEvent>
   6.114 +    <PostBuildEvent>
   6.115 +      <Message>Copy SDL</Message>
   6.116 +    </PostBuildEvent>
   6.117 +  </ItemDefinitionGroup>
   6.118 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
   6.119 +    <Midl>
   6.120 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   6.121 +      <MkTypLibCompatible>true</MkTypLibCompatible>
   6.122 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   6.123 +    </Midl>
   6.124 +    <ClCompile>
   6.125 +      <Optimization>Disabled</Optimization>
   6.126 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   6.127 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   6.128 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   6.129 +      <PrecompiledHeader>
   6.130 +      </PrecompiledHeader>
   6.131 +      <WarningLevel>Level3</WarningLevel>
   6.132 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   6.133 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
   6.134 +      <CompileAs>Default</CompileAs>
   6.135 +    </ClCompile>
   6.136 +    <ResourceCompile>
   6.137 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   6.138 +      <Culture>0x0409</Culture>
   6.139 +    </ResourceCompile>
   6.140 +    <Link>
   6.141 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   6.142 +      <GenerateDebugInformation>true</GenerateDebugInformation>
   6.143 +      <SubSystem>Windows</SubSystem>
   6.144 +    </Link>
   6.145 +    <PostBuildEvent>
   6.146 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
   6.147      </PostBuildEvent>
   6.148      <PostBuildEvent>
   6.149        <Message>Copy SDL</Message>
   6.150 @@ -94,7 +151,6 @@
   6.151        <MkTypLibCompatible>true</MkTypLibCompatible>
   6.152        <SuppressStartupBanner>true</SuppressStartupBanner>
   6.153        <TargetEnvironment>Win32</TargetEnvironment>
   6.154 -      <TypeLibraryName>.\Release/graywin.tlb</TypeLibraryName>
   6.155      </Midl>
   6.156      <ClCompile>
   6.157        <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
   6.158 @@ -105,10 +161,6 @@
   6.159        <FunctionLevelLinking>true</FunctionLevelLinking>
   6.160        <PrecompiledHeader>
   6.161        </PrecompiledHeader>
   6.162 -      <PrecompiledHeaderOutputFile>.\Release/graywin.pch</PrecompiledHeaderOutputFile>
   6.163 -      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
   6.164 -      <ObjectFileName>.\Release/</ObjectFileName>
   6.165 -      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
   6.166        <WarningLevel>Level3</WarningLevel>
   6.167        <SuppressStartupBanner>true</SuppressStartupBanner>
   6.168        <CompileAs>Default</CompileAs>
   6.169 @@ -118,14 +170,45 @@
   6.170        <Culture>0x0409</Culture>
   6.171      </ResourceCompile>
   6.172      <Link>
   6.173 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
   6.174 -      <OutputFile>.\Release/graywin.exe</OutputFile>
   6.175        <SuppressStartupBanner>true</SuppressStartupBanner>
   6.176 -      <ProgramDatabaseFile>.\Release/graywin.pdb</ProgramDatabaseFile>
   6.177        <SubSystem>Windows</SubSystem>
   6.178      </Link>
   6.179      <PostBuildEvent>
   6.180 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll</Command>
   6.181 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
   6.182 +    </PostBuildEvent>
   6.183 +    <PostBuildEvent>
   6.184 +      <Message>Copy SDL</Message>
   6.185 +    </PostBuildEvent>
   6.186 +  </ItemDefinitionGroup>
   6.187 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
   6.188 +    <Midl>
   6.189 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   6.190 +      <MkTypLibCompatible>true</MkTypLibCompatible>
   6.191 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   6.192 +    </Midl>
   6.193 +    <ClCompile>
   6.194 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
   6.195 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   6.196 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   6.197 +      <StringPooling>true</StringPooling>
   6.198 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   6.199 +      <FunctionLevelLinking>true</FunctionLevelLinking>
   6.200 +      <PrecompiledHeader>
   6.201 +      </PrecompiledHeader>
   6.202 +      <WarningLevel>Level3</WarningLevel>
   6.203 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   6.204 +      <CompileAs>Default</CompileAs>
   6.205 +    </ClCompile>
   6.206 +    <ResourceCompile>
   6.207 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   6.208 +      <Culture>0x0409</Culture>
   6.209 +    </ResourceCompile>
   6.210 +    <Link>
   6.211 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   6.212 +      <SubSystem>Windows</SubSystem>
   6.213 +    </Link>
   6.214 +    <PostBuildEvent>
   6.215 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
   6.216      </PostBuildEvent>
   6.217      <PostBuildEvent>
   6.218        <Message>Copy SDL</Message>
   6.219 @@ -135,8 +218,8 @@
   6.220      <ClCompile Include="..\..\..\test\graywin.c" />
   6.221    </ItemGroup>
   6.222    <ItemGroup>
   6.223 -    <Library Include="..\..\Sdl\Debug\SDL.lib" />
   6.224 -    <Library Include="..\..\SDLmain\Debug\SDLmain.lib" />
   6.225 +    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
   6.226 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
   6.227    </ItemGroup>
   6.228    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   6.229    <ImportGroup Label="ExtensionTargets">
     7.1 --- a/VisualC/tests/loopwave/loopwave_VS2010.vcxproj	Tue Apr 19 08:08:50 2011 -0700
     7.2 +++ b/VisualC/tests/loopwave/loopwave_VS2010.vcxproj	Tue Apr 19 09:53:01 2011 -0700
     7.3 @@ -5,10 +5,18 @@
     7.4        <Configuration>Debug</Configuration>
     7.5        <Platform>Win32</Platform>
     7.6      </ProjectConfiguration>
     7.7 +    <ProjectConfiguration Include="Debug|x64">
     7.8 +      <Configuration>Debug</Configuration>
     7.9 +      <Platform>x64</Platform>
    7.10 +    </ProjectConfiguration>
    7.11      <ProjectConfiguration Include="Release|Win32">
    7.12        <Configuration>Release</Configuration>
    7.13        <Platform>Win32</Platform>
    7.14      </ProjectConfiguration>
    7.15 +    <ProjectConfiguration Include="Release|x64">
    7.16 +      <Configuration>Release</Configuration>
    7.17 +      <Platform>x64</Platform>
    7.18 +    </ProjectConfiguration>
    7.19    </ItemGroup>
    7.20    <PropertyGroup Label="Globals">
    7.21      <ProjectName>loopwave</ProjectName>
    7.22 @@ -20,10 +28,19 @@
    7.23      <ConfigurationType>Application</ConfigurationType>
    7.24      <UseOfMfc>false</UseOfMfc>
    7.25    </PropertyGroup>
    7.26 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    7.27 +    <ConfigurationType>Application</ConfigurationType>
    7.28 +    <UseOfMfc>false</UseOfMfc>
    7.29 +    <CharacterSet>MultiByte</CharacterSet>
    7.30 +  </PropertyGroup>
    7.31    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    7.32      <ConfigurationType>Application</ConfigurationType>
    7.33      <UseOfMfc>false</UseOfMfc>
    7.34    </PropertyGroup>
    7.35 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    7.36 +    <ConfigurationType>Application</ConfigurationType>
    7.37 +    <UseOfMfc>false</UseOfMfc>
    7.38 +  </PropertyGroup>
    7.39    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    7.40    <ImportGroup Label="ExtensionSettings">
    7.41    </ImportGroup>
    7.42 @@ -31,19 +48,33 @@
    7.43      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    7.44      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    7.45    </ImportGroup>
    7.46 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    7.47 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    7.48 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    7.49 +  </ImportGroup>
    7.50    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    7.51      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    7.52      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    7.53    </ImportGroup>
    7.54 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    7.55 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    7.56 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    7.57 +  </ImportGroup>
    7.58    <PropertyGroup Label="UserMacros" />
    7.59    <PropertyGroup>
    7.60      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    7.61 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
    7.62 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
    7.63 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
    7.64 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
    7.65 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    7.66 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    7.67      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    7.68 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
    7.69 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
    7.70 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    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    </PropertyGroup>
    7.78    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    7.79      <Midl>
    7.80 @@ -51,7 +82,6 @@
    7.81        <MkTypLibCompatible>true</MkTypLibCompatible>
    7.82        <SuppressStartupBanner>true</SuppressStartupBanner>
    7.83        <TargetEnvironment>Win32</TargetEnvironment>
    7.84 -      <TypeLibraryName>.\Release/loopwave.tlb</TypeLibraryName>
    7.85      </Midl>
    7.86      <ClCompile>
    7.87        <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
    7.88 @@ -62,10 +92,6 @@
    7.89        <FunctionLevelLinking>true</FunctionLevelLinking>
    7.90        <PrecompiledHeader>
    7.91        </PrecompiledHeader>
    7.92 -      <PrecompiledHeaderOutputFile>.\Release/loopwave.pch</PrecompiledHeaderOutputFile>
    7.93 -      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
    7.94 -      <ObjectFileName>.\Release/</ObjectFileName>
    7.95 -      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
    7.96        <WarningLevel>Level3</WarningLevel>
    7.97        <SuppressStartupBanner>true</SuppressStartupBanner>
    7.98        <CompileAs>Default</CompileAs>
    7.99 @@ -75,14 +101,45 @@
   7.100        <Culture>0x0409</Culture>
   7.101      </ResourceCompile>
   7.102      <Link>
   7.103 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
   7.104 -      <OutputFile>.\Release/loopwave.exe</OutputFile>
   7.105        <SuppressStartupBanner>true</SuppressStartupBanner>
   7.106 -      <ProgramDatabaseFile>.\Release/loopwave.pdb</ProgramDatabaseFile>
   7.107        <SubSystem>Windows</SubSystem>
   7.108      </Link>
   7.109      <PostBuildEvent>
   7.110 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll</Command>
   7.111 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
   7.112 +    </PostBuildEvent>
   7.113 +    <PostBuildEvent>
   7.114 +      <Message>Copy SDL</Message>
   7.115 +    </PostBuildEvent>
   7.116 +  </ItemDefinitionGroup>
   7.117 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
   7.118 +    <Midl>
   7.119 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   7.120 +      <MkTypLibCompatible>true</MkTypLibCompatible>
   7.121 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   7.122 +    </Midl>
   7.123 +    <ClCompile>
   7.124 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
   7.125 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   7.126 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   7.127 +      <StringPooling>true</StringPooling>
   7.128 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   7.129 +      <FunctionLevelLinking>true</FunctionLevelLinking>
   7.130 +      <PrecompiledHeader>
   7.131 +      </PrecompiledHeader>
   7.132 +      <WarningLevel>Level3</WarningLevel>
   7.133 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   7.134 +      <CompileAs>Default</CompileAs>
   7.135 +    </ClCompile>
   7.136 +    <ResourceCompile>
   7.137 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   7.138 +      <Culture>0x0409</Culture>
   7.139 +    </ResourceCompile>
   7.140 +    <Link>
   7.141 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   7.142 +      <SubSystem>Windows</SubSystem>
   7.143 +    </Link>
   7.144 +    <PostBuildEvent>
   7.145 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
   7.146      </PostBuildEvent>
   7.147      <PostBuildEvent>
   7.148        <Message>Copy SDL</Message>
   7.149 @@ -94,7 +151,6 @@
   7.150        <MkTypLibCompatible>true</MkTypLibCompatible>
   7.151        <SuppressStartupBanner>true</SuppressStartupBanner>
   7.152        <TargetEnvironment>Win32</TargetEnvironment>
   7.153 -      <TypeLibraryName>.\Debug/loopwave.tlb</TypeLibraryName>
   7.154      </Midl>
   7.155      <ClCompile>
   7.156        <Optimization>Disabled</Optimization>
   7.157 @@ -103,10 +159,6 @@
   7.158        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   7.159        <PrecompiledHeader>
   7.160        </PrecompiledHeader>
   7.161 -      <PrecompiledHeaderOutputFile>.\Debug/loopwave.pch</PrecompiledHeaderOutputFile>
   7.162 -      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
   7.163 -      <ObjectFileName>.\Debug/</ObjectFileName>
   7.164 -      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
   7.165        <WarningLevel>Level3</WarningLevel>
   7.166        <SuppressStartupBanner>true</SuppressStartupBanner>
   7.167        <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
   7.168 @@ -117,15 +169,46 @@
   7.169        <Culture>0x0409</Culture>
   7.170      </ResourceCompile>
   7.171      <Link>
   7.172 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
   7.173 -      <OutputFile>.\Debug/loopwave.exe</OutputFile>
   7.174        <SuppressStartupBanner>true</SuppressStartupBanner>
   7.175        <GenerateDebugInformation>true</GenerateDebugInformation>
   7.176 -      <ProgramDatabaseFile>.\Debug/loopwave.pdb</ProgramDatabaseFile>
   7.177        <SubSystem>Windows</SubSystem>
   7.178      </Link>
   7.179      <PostBuildEvent>
   7.180 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll</Command>
   7.181 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
   7.182 +    </PostBuildEvent>
   7.183 +    <PostBuildEvent>
   7.184 +      <Message>Copy SDL</Message>
   7.185 +    </PostBuildEvent>
   7.186 +  </ItemDefinitionGroup>
   7.187 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
   7.188 +    <Midl>
   7.189 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   7.190 +      <MkTypLibCompatible>true</MkTypLibCompatible>
   7.191 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   7.192 +    </Midl>
   7.193 +    <ClCompile>
   7.194 +      <Optimization>Disabled</Optimization>
   7.195 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   7.196 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   7.197 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   7.198 +      <PrecompiledHeader>
   7.199 +      </PrecompiledHeader>
   7.200 +      <WarningLevel>Level3</WarningLevel>
   7.201 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   7.202 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
   7.203 +      <CompileAs>Default</CompileAs>
   7.204 +    </ClCompile>
   7.205 +    <ResourceCompile>
   7.206 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   7.207 +      <Culture>0x0409</Culture>
   7.208 +    </ResourceCompile>
   7.209 +    <Link>
   7.210 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   7.211 +      <GenerateDebugInformation>true</GenerateDebugInformation>
   7.212 +      <SubSystem>Windows</SubSystem>
   7.213 +    </Link>
   7.214 +    <PostBuildEvent>
   7.215 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
   7.216      </PostBuildEvent>
   7.217      <PostBuildEvent>
   7.218        <Message>Copy SDL</Message>
   7.219 @@ -135,8 +218,8 @@
   7.220      <ClCompile Include="..\..\..\Test\Loopwave.c" />
   7.221    </ItemGroup>
   7.222    <ItemGroup>
   7.223 -    <Library Include="..\..\Sdl\Debug\SDL.lib" />
   7.224 -    <Library Include="..\..\SDLmain\Debug\SDLmain.lib" />
   7.225 +    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
   7.226 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
   7.227    </ItemGroup>
   7.228    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   7.229    <ImportGroup Label="ExtensionTargets">
     8.1 --- a/VisualC/tests/testalpha/testalpha_VS2010.vcxproj	Tue Apr 19 08:08:50 2011 -0700
     8.2 +++ b/VisualC/tests/testalpha/testalpha_VS2010.vcxproj	Tue Apr 19 09:53:01 2011 -0700
     8.3 @@ -5,10 +5,18 @@
     8.4        <Configuration>Debug</Configuration>
     8.5        <Platform>Win32</Platform>
     8.6      </ProjectConfiguration>
     8.7 +    <ProjectConfiguration Include="Debug|x64">
     8.8 +      <Configuration>Debug</Configuration>
     8.9 +      <Platform>x64</Platform>
    8.10 +    </ProjectConfiguration>
    8.11      <ProjectConfiguration Include="Release|Win32">
    8.12        <Configuration>Release</Configuration>
    8.13        <Platform>Win32</Platform>
    8.14      </ProjectConfiguration>
    8.15 +    <ProjectConfiguration Include="Release|x64">
    8.16 +      <Configuration>Release</Configuration>
    8.17 +      <Platform>x64</Platform>
    8.18 +    </ProjectConfiguration>
    8.19    </ItemGroup>
    8.20    <PropertyGroup Label="Globals">
    8.21      <ProjectName>testalpha</ProjectName>
    8.22 @@ -20,10 +28,19 @@
    8.23      <ConfigurationType>Application</ConfigurationType>
    8.24      <UseOfMfc>false</UseOfMfc>
    8.25    </PropertyGroup>
    8.26 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    8.27 +    <ConfigurationType>Application</ConfigurationType>
    8.28 +    <UseOfMfc>false</UseOfMfc>
    8.29 +  </PropertyGroup>
    8.30    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    8.31      <ConfigurationType>Application</ConfigurationType>
    8.32      <UseOfMfc>false</UseOfMfc>
    8.33    </PropertyGroup>
    8.34 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    8.35 +    <ConfigurationType>Application</ConfigurationType>
    8.36 +    <UseOfMfc>false</UseOfMfc>
    8.37 +    <CharacterSet>MultiByte</CharacterSet>
    8.38 +  </PropertyGroup>
    8.39    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    8.40    <ImportGroup Label="ExtensionSettings">
    8.41    </ImportGroup>
    8.42 @@ -31,19 +48,33 @@
    8.43      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    8.44      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    8.45    </ImportGroup>
    8.46 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    8.47 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    8.48 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    8.49 +  </ImportGroup>
    8.50    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    8.51      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    8.52      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
    8.53    </ImportGroup>
    8.54 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" 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    <PropertyGroup Label="UserMacros" />
    8.59    <PropertyGroup>
    8.60      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    8.61 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
    8.62 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
    8.63 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
    8.64 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
    8.65 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    8.66 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    8.67      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
    8.68 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
    8.69 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
    8.70 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    8.71 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
    8.72 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
    8.73 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    8.74 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    8.75      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    8.76 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    8.77    </PropertyGroup>
    8.78    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    8.79      <Midl>
    8.80 @@ -51,7 +82,6 @@
    8.81        <MkTypLibCompatible>true</MkTypLibCompatible>
    8.82        <SuppressStartupBanner>true</SuppressStartupBanner>
    8.83        <TargetEnvironment>Win32</TargetEnvironment>
    8.84 -      <TypeLibraryName>.\Debug/testalpha.tlb</TypeLibraryName>
    8.85      </Midl>
    8.86      <ClCompile>
    8.87        <Optimization>Disabled</Optimization>
    8.88 @@ -60,10 +90,6 @@
    8.89        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    8.90        <PrecompiledHeader>
    8.91        </PrecompiledHeader>
    8.92 -      <PrecompiledHeaderOutputFile>.\Debug/testalpha.pch</PrecompiledHeaderOutputFile>
    8.93 -      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
    8.94 -      <ObjectFileName>.\Debug/</ObjectFileName>
    8.95 -      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
    8.96        <WarningLevel>Level3</WarningLevel>
    8.97        <SuppressStartupBanner>true</SuppressStartupBanner>
    8.98        <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    8.99 @@ -74,15 +100,47 @@
   8.100        <Culture>0x0409</Culture>
   8.101      </ResourceCompile>
   8.102      <Link>
   8.103 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
   8.104 -      <OutputFile>.\Debug/testalpha.exe</OutputFile>
   8.105        <SuppressStartupBanner>true</SuppressStartupBanner>
   8.106        <GenerateDebugInformation>true</GenerateDebugInformation>
   8.107 -      <ProgramDatabaseFile>.\Debug/testalpha.pdb</ProgramDatabaseFile>
   8.108        <SubSystem>Windows</SubSystem>
   8.109      </Link>
   8.110      <PostBuildEvent>
   8.111 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll
   8.112 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
   8.113 +copy $(SolutionDir)\..\test\icon.bmp $(ProjectDir)\icon.bmp</Command>
   8.114 +    </PostBuildEvent>
   8.115 +    <PostBuildEvent>
   8.116 +      <Message>Copy SDL and data files</Message>
   8.117 +    </PostBuildEvent>
   8.118 +  </ItemDefinitionGroup>
   8.119 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
   8.120 +    <Midl>
   8.121 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   8.122 +      <MkTypLibCompatible>true</MkTypLibCompatible>
   8.123 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   8.124 +    </Midl>
   8.125 +    <ClCompile>
   8.126 +      <Optimization>Disabled</Optimization>
   8.127 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   8.128 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   8.129 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   8.130 +      <PrecompiledHeader>
   8.131 +      </PrecompiledHeader>
   8.132 +      <WarningLevel>Level3</WarningLevel>
   8.133 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   8.134 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
   8.135 +      <CompileAs>Default</CompileAs>
   8.136 +    </ClCompile>
   8.137 +    <ResourceCompile>
   8.138 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   8.139 +      <Culture>0x0409</Culture>
   8.140 +    </ResourceCompile>
   8.141 +    <Link>
   8.142 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   8.143 +      <GenerateDebugInformation>true</GenerateDebugInformation>
   8.144 +      <SubSystem>Windows</SubSystem>
   8.145 +    </Link>
   8.146 +    <PostBuildEvent>
   8.147 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
   8.148  copy $(SolutionDir)\..\test\icon.bmp $(ProjectDir)\icon.bmp</Command>
   8.149      </PostBuildEvent>
   8.150      <PostBuildEvent>
   8.151 @@ -95,7 +153,6 @@
   8.152        <MkTypLibCompatible>true</MkTypLibCompatible>
   8.153        <SuppressStartupBanner>true</SuppressStartupBanner>
   8.154        <TargetEnvironment>Win32</TargetEnvironment>
   8.155 -      <TypeLibraryName>.\Release/testalpha.tlb</TypeLibraryName>
   8.156      </Midl>
   8.157      <ClCompile>
   8.158        <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
   8.159 @@ -106,10 +163,6 @@
   8.160        <FunctionLevelLinking>true</FunctionLevelLinking>
   8.161        <PrecompiledHeader>
   8.162        </PrecompiledHeader>
   8.163 -      <PrecompiledHeaderOutputFile>.\Release/testalpha.pch</PrecompiledHeaderOutputFile>
   8.164 -      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
   8.165 -      <ObjectFileName>.\Release/</ObjectFileName>
   8.166 -      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
   8.167        <WarningLevel>Level3</WarningLevel>
   8.168        <SuppressStartupBanner>true</SuppressStartupBanner>
   8.169        <CompileAs>Default</CompileAs>
   8.170 @@ -119,14 +172,46 @@
   8.171        <Culture>0x0409</Culture>
   8.172      </ResourceCompile>
   8.173      <Link>
   8.174 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
   8.175 -      <OutputFile>.\Release/testalpha.exe</OutputFile>
   8.176        <SuppressStartupBanner>true</SuppressStartupBanner>
   8.177 -      <ProgramDatabaseFile>.\Release/testalpha.pdb</ProgramDatabaseFile>
   8.178        <SubSystem>Windows</SubSystem>
   8.179      </Link>
   8.180      <PostBuildEvent>
   8.181 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll
   8.182 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
   8.183 +copy $(SolutionDir)\..\test\icon.bmp $(ProjectDir)\icon.bmp</Command>
   8.184 +    </PostBuildEvent>
   8.185 +    <PostBuildEvent>
   8.186 +      <Message>Copy SDL and data files</Message>
   8.187 +    </PostBuildEvent>
   8.188 +  </ItemDefinitionGroup>
   8.189 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
   8.190 +    <Midl>
   8.191 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   8.192 +      <MkTypLibCompatible>true</MkTypLibCompatible>
   8.193 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   8.194 +    </Midl>
   8.195 +    <ClCompile>
   8.196 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
   8.197 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   8.198 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   8.199 +      <StringPooling>true</StringPooling>
   8.200 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   8.201 +      <FunctionLevelLinking>true</FunctionLevelLinking>
   8.202 +      <PrecompiledHeader>
   8.203 +      </PrecompiledHeader>
   8.204 +      <WarningLevel>Level3</WarningLevel>
   8.205 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   8.206 +      <CompileAs>Default</CompileAs>
   8.207 +    </ClCompile>
   8.208 +    <ResourceCompile>
   8.209 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   8.210 +      <Culture>0x0409</Culture>
   8.211 +    </ResourceCompile>
   8.212 +    <Link>
   8.213 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   8.214 +      <SubSystem>Windows</SubSystem>
   8.215 +    </Link>
   8.216 +    <PostBuildEvent>
   8.217 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
   8.218  copy $(SolutionDir)\..\test\icon.bmp $(ProjectDir)\icon.bmp</Command>
   8.219      </PostBuildEvent>
   8.220      <PostBuildEvent>
   8.221 @@ -134,8 +219,8 @@
   8.222      </PostBuildEvent>
   8.223    </ItemDefinitionGroup>
   8.224    <ItemGroup>
   8.225 -    <Library Include="..\..\Sdl\Debug\SDL.lib" />
   8.226 -    <Library Include="..\..\SDLmain\Debug\SDLmain.lib" />
   8.227 +    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
   8.228 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
   8.229    </ItemGroup>
   8.230    <ItemGroup>
   8.231      <ClCompile Include="..\..\..\Test\testalpha.c" />
     9.1 --- a/VisualC/tests/testcursor/testcursor_VS2010.vcxproj	Tue Apr 19 08:08:50 2011 -0700
     9.2 +++ b/VisualC/tests/testcursor/testcursor_VS2010.vcxproj	Tue Apr 19 09:53:01 2011 -0700
     9.3 @@ -5,10 +5,18 @@
     9.4        <Configuration>Debug</Configuration>
     9.5        <Platform>Win32</Platform>
     9.6      </ProjectConfiguration>
     9.7 +    <ProjectConfiguration Include="Debug|x64">
     9.8 +      <Configuration>Debug</Configuration>
     9.9 +      <Platform>x64</Platform>
    9.10 +    </ProjectConfiguration>
    9.11      <ProjectConfiguration Include="Release|Win32">
    9.12        <Configuration>Release</Configuration>
    9.13        <Platform>Win32</Platform>
    9.14      </ProjectConfiguration>
    9.15 +    <ProjectConfiguration Include="Release|x64">
    9.16 +      <Configuration>Release</Configuration>
    9.17 +      <Platform>x64</Platform>
    9.18 +    </ProjectConfiguration>
    9.19    </ItemGroup>
    9.20    <PropertyGroup Label="Globals">
    9.21      <ProjectName>testcursor</ProjectName>
    9.22 @@ -20,10 +28,19 @@
    9.23      <ConfigurationType>Application</ConfigurationType>
    9.24      <UseOfMfc>false</UseOfMfc>
    9.25    </PropertyGroup>
    9.26 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    9.27 +    <ConfigurationType>Application</ConfigurationType>
    9.28 +    <UseOfMfc>false</UseOfMfc>
    9.29 +  </PropertyGroup>
    9.30    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    9.31      <ConfigurationType>Application</ConfigurationType>
    9.32      <UseOfMfc>false</UseOfMfc>
    9.33    </PropertyGroup>
    9.34 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    9.35 +    <ConfigurationType>Application</ConfigurationType>
    9.36 +    <UseOfMfc>false</UseOfMfc>
    9.37 +    <CharacterSet>MultiByte</CharacterSet>
    9.38 +  </PropertyGroup>
    9.39    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    9.40    <ImportGroup Label="ExtensionSettings">
    9.41    </ImportGroup>
    9.42 @@ -31,19 +48,33 @@
    9.43      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    9.44      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
    9.45    </ImportGroup>
    9.46 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    9.47 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    9.48 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
    9.49 +  </ImportGroup>
    9.50    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    9.51      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    9.52      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
    9.53    </ImportGroup>
    9.54 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    9.55 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    9.56 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
    9.57 +  </ImportGroup>
    9.58    <PropertyGroup Label="UserMacros" />
    9.59    <PropertyGroup>
    9.60      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    9.61 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
    9.62 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
    9.63 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
    9.64 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
    9.65 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    9.66 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    9.67      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
    9.68 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
    9.69 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
    9.70 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    9.71 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
    9.72 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
    9.73 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    9.74 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    9.75      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    9.76 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    9.77    </PropertyGroup>
    9.78    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    9.79      <Midl>
    9.80 @@ -51,9 +82,6 @@
    9.81        <MkTypLibCompatible>true</MkTypLibCompatible>
    9.82        <SuppressStartupBanner>true</SuppressStartupBanner>
    9.83        <TargetEnvironment>Win32</TargetEnvironment>
    9.84 -      <TypeLibraryName>.\Debug/testcursor.tlb</TypeLibraryName>
    9.85 -      <HeaderFileName>
    9.86 -      </HeaderFileName>
    9.87      </Midl>
    9.88      <ClCompile>
    9.89        <Optimization>Disabled</Optimization>
    9.90 @@ -61,10 +89,6 @@
    9.91        <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    9.92        <MinimalRebuild>true</MinimalRebuild>
    9.93        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    9.94 -      <PrecompiledHeaderOutputFile>.\Debug/testcursor.pch</PrecompiledHeaderOutputFile>
    9.95 -      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
    9.96 -      <ObjectFileName>.\Debug/</ObjectFileName>
    9.97 -      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
    9.98        <WarningLevel>Level3</WarningLevel>
    9.99        <SuppressStartupBanner>true</SuppressStartupBanner>
   9.100        <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
   9.101 @@ -74,34 +98,64 @@
   9.102        <Culture>0x0409</Culture>
   9.103      </ResourceCompile>
   9.104      <Link>
   9.105 -      <OutputFile>.\Debug/testcursor.exe</OutputFile>
   9.106        <SuppressStartupBanner>true</SuppressStartupBanner>
   9.107        <GenerateDebugInformation>true</GenerateDebugInformation>
   9.108 -      <ProgramDatabaseFile>.\Debug/testcursor.pdb</ProgramDatabaseFile>
   9.109        <SubSystem>Windows</SubSystem>
   9.110 -      <TargetMachine>MachineX86</TargetMachine>
   9.111      </Link>
   9.112      <Bscmake>
   9.113        <SuppressStartupBanner>true</SuppressStartupBanner>
   9.114        <OutputFile>.\Debug/testcursor.bsc</OutputFile>
   9.115      </Bscmake>
   9.116      <PostBuildEvent>
   9.117 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll
   9.118 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
   9.119  copy $(SolutionDir)\..\test\icon.bmp $(ProjectDir)\icon.bmp</Command>
   9.120      </PostBuildEvent>
   9.121      <PostBuildEvent>
   9.122        <Message>Copy SDL and data files</Message>
   9.123      </PostBuildEvent>
   9.124    </ItemDefinitionGroup>
   9.125 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
   9.126 +    <Midl>
   9.127 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   9.128 +      <MkTypLibCompatible>true</MkTypLibCompatible>
   9.129 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   9.130 +    </Midl>
   9.131 +    <ClCompile>
   9.132 +      <Optimization>Disabled</Optimization>
   9.133 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   9.134 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   9.135 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   9.136 +      <WarningLevel>Level3</WarningLevel>
   9.137 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   9.138 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
   9.139 +    </ClCompile>
   9.140 +    <ResourceCompile>
   9.141 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   9.142 +      <Culture>0x0409</Culture>
   9.143 +    </ResourceCompile>
   9.144 +    <Link>
   9.145 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   9.146 +      <GenerateDebugInformation>true</GenerateDebugInformation>
   9.147 +      <SubSystem>Windows</SubSystem>
   9.148 +    </Link>
   9.149 +    <Bscmake>
   9.150 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   9.151 +      <OutputFile>.\Debug/testcursor.bsc</OutputFile>
   9.152 +    </Bscmake>
   9.153 +    <PostBuildEvent>
   9.154 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
   9.155 +copy $(SolutionDir)\..\test\icon.bmp $(Platform)\$(Configuration)\icon.bmp</Command>
   9.156 +    </PostBuildEvent>
   9.157 +    <PostBuildEvent>
   9.158 +      <Message>Copy SDL and data files</Message>
   9.159 +    </PostBuildEvent>
   9.160 +  </ItemDefinitionGroup>
   9.161    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   9.162      <Midl>
   9.163        <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   9.164        <MkTypLibCompatible>true</MkTypLibCompatible>
   9.165        <SuppressStartupBanner>true</SuppressStartupBanner>
   9.166        <TargetEnvironment>Win32</TargetEnvironment>
   9.167 -      <TypeLibraryName>.\Release/testcursor.tlb</TypeLibraryName>
   9.168 -      <HeaderFileName>
   9.169 -      </HeaderFileName>
   9.170      </Midl>
   9.171      <ClCompile>
   9.172        <Optimization>MaxSpeed</Optimization>
   9.173 @@ -111,10 +165,6 @@
   9.174        <StringPooling>true</StringPooling>
   9.175        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   9.176        <FunctionLevelLinking>true</FunctionLevelLinking>
   9.177 -      <PrecompiledHeaderOutputFile>.\Release/testcursor.pch</PrecompiledHeaderOutputFile>
   9.178 -      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
   9.179 -      <ObjectFileName>.\Release/</ObjectFileName>
   9.180 -      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
   9.181        <WarningLevel>Level3</WarningLevel>
   9.182        <SuppressStartupBanner>true</SuppressStartupBanner>
   9.183      </ClCompile>
   9.184 @@ -123,18 +173,52 @@
   9.185        <Culture>0x0409</Culture>
   9.186      </ResourceCompile>
   9.187      <Link>
   9.188 -      <OutputFile>.\Release/testcursor.exe</OutputFile>
   9.189        <SuppressStartupBanner>true</SuppressStartupBanner>
   9.190 -      <ProgramDatabaseFile>.\Release/testcursor.pdb</ProgramDatabaseFile>
   9.191        <SubSystem>Windows</SubSystem>
   9.192 -      <TargetMachine>MachineX86</TargetMachine>
   9.193      </Link>
   9.194      <Bscmake>
   9.195        <SuppressStartupBanner>true</SuppressStartupBanner>
   9.196        <OutputFile>.\Release/testcursor.bsc</OutputFile>
   9.197      </Bscmake>
   9.198      <PostBuildEvent>
   9.199 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll
   9.200 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
   9.201 +copy $(SolutionDir)\..\test\icon.bmp $(ProjectDir)\icon.bmp</Command>
   9.202 +    </PostBuildEvent>
   9.203 +    <PostBuildEvent>
   9.204 +      <Message>Copy SDL and data files</Message>
   9.205 +    </PostBuildEvent>
   9.206 +  </ItemDefinitionGroup>
   9.207 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
   9.208 +    <Midl>
   9.209 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   9.210 +      <MkTypLibCompatible>true</MkTypLibCompatible>
   9.211 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   9.212 +    </Midl>
   9.213 +    <ClCompile>
   9.214 +      <Optimization>MaxSpeed</Optimization>
   9.215 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
   9.216 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   9.217 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   9.218 +      <StringPooling>true</StringPooling>
   9.219 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   9.220 +      <FunctionLevelLinking>true</FunctionLevelLinking>
   9.221 +      <WarningLevel>Level3</WarningLevel>
   9.222 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   9.223 +    </ClCompile>
   9.224 +    <ResourceCompile>
   9.225 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   9.226 +      <Culture>0x0409</Culture>
   9.227 +    </ResourceCompile>
   9.228 +    <Link>
   9.229 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   9.230 +      <SubSystem>Windows</SubSystem>
   9.231 +    </Link>
   9.232 +    <Bscmake>
   9.233 +      <SuppressStartupBanner>true</SuppressStartupBanner>
   9.234 +      <OutputFile>.\Release/testcursor.bsc</OutputFile>
   9.235 +    </Bscmake>
   9.236 +    <PostBuildEvent>
   9.237 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
   9.238  copy $(SolutionDir)\..\test\icon.bmp $(ProjectDir)\icon.bmp</Command>
   9.239      </PostBuildEvent>
   9.240      <PostBuildEvent>
   9.241 @@ -142,15 +226,19 @@
   9.242      </PostBuildEvent>
   9.243    </ItemDefinitionGroup>
   9.244    <ItemGroup>
   9.245 -    <Library Include="..\..\Sdl\Debug\SDL.lib" />
   9.246 -    <Library Include="..\..\SDLmain\Debug\SDLmain.lib" />
   9.247 +    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
   9.248 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
   9.249    </ItemGroup>
   9.250    <ItemGroup>
   9.251      <ClCompile Include="..\..\..\Test\testcursor.c">
   9.252        <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   9.253 +      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   9.254        <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
   9.255 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
   9.256        <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   9.257 +      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   9.258        <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
   9.259 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
   9.260      </ClCompile>
   9.261    </ItemGroup>
   9.262    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    10.1 --- a/VisualC/tests/testdraw2/testdraw2_VS2010.vcxproj	Tue Apr 19 08:08:50 2011 -0700
    10.2 +++ b/VisualC/tests/testdraw2/testdraw2_VS2010.vcxproj	Tue Apr 19 09:53:01 2011 -0700
    10.3 @@ -5,10 +5,18 @@
    10.4        <Configuration>Debug</Configuration>
    10.5        <Platform>Win32</Platform>
    10.6      </ProjectConfiguration>
    10.7 +    <ProjectConfiguration Include="Debug|x64">
    10.8 +      <Configuration>Debug</Configuration>
    10.9 +      <Platform>x64</Platform>
   10.10 +    </ProjectConfiguration>
   10.11      <ProjectConfiguration Include="Release|Win32">
   10.12        <Configuration>Release</Configuration>
   10.13        <Platform>Win32</Platform>
   10.14      </ProjectConfiguration>
   10.15 +    <ProjectConfiguration Include="Release|x64">
   10.16 +      <Configuration>Release</Configuration>
   10.17 +      <Platform>x64</Platform>
   10.18 +    </ProjectConfiguration>
   10.19    </ItemGroup>
   10.20    <PropertyGroup Label="Globals">
   10.21      <ProjectName>testdraw2</ProjectName>
   10.22 @@ -20,10 +28,19 @@
   10.23      <ConfigurationType>Application</ConfigurationType>
   10.24      <UseOfMfc>false</UseOfMfc>
   10.25    </PropertyGroup>
   10.26 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
   10.27 +    <ConfigurationType>Application</ConfigurationType>
   10.28 +    <UseOfMfc>false</UseOfMfc>
   10.29 +    <CharacterSet>MultiByte</CharacterSet>
   10.30 +  </PropertyGroup>
   10.31    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
   10.32      <ConfigurationType>Application</ConfigurationType>
   10.33      <UseOfMfc>false</UseOfMfc>
   10.34    </PropertyGroup>
   10.35 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
   10.36 +    <ConfigurationType>Application</ConfigurationType>
   10.37 +    <UseOfMfc>false</UseOfMfc>
   10.38 +  </PropertyGroup>
   10.39    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   10.40    <ImportGroup Label="ExtensionSettings">
   10.41    </ImportGroup>
   10.42 @@ -31,19 +48,33 @@
   10.43      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   10.44      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   10.45    </ImportGroup>
   10.46 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
   10.47 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   10.48 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   10.49 +  </ImportGroup>
   10.50    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
   10.51      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   10.52      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   10.53    </ImportGroup>
   10.54 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
   10.55 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   10.56 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   10.57 +  </ImportGroup>
   10.58    <PropertyGroup Label="UserMacros" />
   10.59    <PropertyGroup>
   10.60      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   10.61 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
   10.62 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
   10.63 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
   10.64 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
   10.65 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
   10.66 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
   10.67      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
   10.68 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
   10.69 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
   10.70 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   10.71 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
   10.72 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
   10.73 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
   10.74 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
   10.75      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
   10.76 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   10.77    </PropertyGroup>
   10.78    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   10.79      <Midl>
   10.80 @@ -51,7 +82,6 @@
   10.81        <MkTypLibCompatible>true</MkTypLibCompatible>
   10.82        <SuppressStartupBanner>true</SuppressStartupBanner>
   10.83        <TargetEnvironment>Win32</TargetEnvironment>
   10.84 -      <TypeLibraryName>.\Release/testdraw2.tlb</TypeLibraryName>
   10.85      </Midl>
   10.86      <ClCompile>
   10.87        <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
   10.88 @@ -62,10 +92,6 @@
   10.89        <FunctionLevelLinking>true</FunctionLevelLinking>
   10.90        <PrecompiledHeader>
   10.91        </PrecompiledHeader>
   10.92 -      <PrecompiledHeaderOutputFile>.\Release/testdraw2.pch</PrecompiledHeaderOutputFile>
   10.93 -      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
   10.94 -      <ObjectFileName>.\Release/</ObjectFileName>
   10.95 -      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
   10.96        <WarningLevel>Level3</WarningLevel>
   10.97        <SuppressStartupBanner>true</SuppressStartupBanner>
   10.98        <CompileAs>Default</CompileAs>
   10.99 @@ -75,14 +101,45 @@
  10.100        <Culture>0x0409</Culture>
  10.101      </ResourceCompile>
  10.102      <Link>
  10.103 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  10.104 -      <OutputFile>.\Release/testdraw2.exe</OutputFile>
  10.105        <SuppressStartupBanner>true</SuppressStartupBanner>
  10.106 -      <ProgramDatabaseFile>.\Release/testdraw2.pdb</ProgramDatabaseFile>
  10.107        <SubSystem>Windows</SubSystem>
  10.108      </Link>
  10.109      <PostBuildEvent>
  10.110 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll</Command>
  10.111 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  10.112 +    </PostBuildEvent>
  10.113 +    <PostBuildEvent>
  10.114 +      <Message>Copy SDL</Message>
  10.115 +    </PostBuildEvent>
  10.116 +  </ItemDefinitionGroup>
  10.117 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  10.118 +    <Midl>
  10.119 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  10.120 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  10.121 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  10.122 +    </Midl>
  10.123 +    <ClCompile>
  10.124 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
  10.125 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  10.126 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  10.127 +      <StringPooling>true</StringPooling>
  10.128 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  10.129 +      <FunctionLevelLinking>true</FunctionLevelLinking>
  10.130 +      <PrecompiledHeader>
  10.131 +      </PrecompiledHeader>
  10.132 +      <WarningLevel>Level3</WarningLevel>
  10.133 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  10.134 +      <CompileAs>Default</CompileAs>
  10.135 +    </ClCompile>
  10.136 +    <ResourceCompile>
  10.137 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  10.138 +      <Culture>0x0409</Culture>
  10.139 +    </ResourceCompile>
  10.140 +    <Link>
  10.141 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  10.142 +      <SubSystem>Windows</SubSystem>
  10.143 +    </Link>
  10.144 +    <PostBuildEvent>
  10.145 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  10.146      </PostBuildEvent>
  10.147      <PostBuildEvent>
  10.148        <Message>Copy SDL</Message>
  10.149 @@ -94,7 +151,6 @@
  10.150        <MkTypLibCompatible>true</MkTypLibCompatible>
  10.151        <SuppressStartupBanner>true</SuppressStartupBanner>
  10.152        <TargetEnvironment>Win32</TargetEnvironment>
  10.153 -      <TypeLibraryName>.\Debug/testdraw2.tlb</TypeLibraryName>
  10.154      </Midl>
  10.155      <ClCompile>
  10.156        <Optimization>Disabled</Optimization>
  10.157 @@ -103,10 +159,6 @@
  10.158        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  10.159        <PrecompiledHeader>
  10.160        </PrecompiledHeader>
  10.161 -      <PrecompiledHeaderOutputFile>.\Debug/testdraw2.pch</PrecompiledHeaderOutputFile>
  10.162 -      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
  10.163 -      <ObjectFileName>.\Debug/</ObjectFileName>
  10.164 -      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
  10.165        <WarningLevel>Level3</WarningLevel>
  10.166        <SuppressStartupBanner>true</SuppressStartupBanner>
  10.167        <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
  10.168 @@ -117,15 +169,46 @@
  10.169        <Culture>0x0409</Culture>
  10.170      </ResourceCompile>
  10.171      <Link>
  10.172 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  10.173 -      <OutputFile>.\Debug/testdraw2.exe</OutputFile>
  10.174        <SuppressStartupBanner>true</SuppressStartupBanner>
  10.175        <GenerateDebugInformation>true</GenerateDebugInformation>
  10.176 -      <ProgramDatabaseFile>.\Debug/testdraw2.pdb</ProgramDatabaseFile>
  10.177        <SubSystem>Windows</SubSystem>
  10.178      </Link>
  10.179      <PostBuildEvent>
  10.180 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll</Command>
  10.181 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  10.182 +    </PostBuildEvent>
  10.183 +    <PostBuildEvent>
  10.184 +      <Message>Copy SDL</Message>
  10.185 +    </PostBuildEvent>
  10.186 +  </ItemDefinitionGroup>
  10.187 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
  10.188 +    <Midl>
  10.189 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  10.190 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  10.191 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  10.192 +    </Midl>
  10.193 +    <ClCompile>
  10.194 +      <Optimization>Disabled</Optimization>
  10.195 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  10.196 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  10.197 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  10.198 +      <PrecompiledHeader>
  10.199 +      </PrecompiledHeader>
  10.200 +      <WarningLevel>Level3</WarningLevel>
  10.201 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  10.202 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
  10.203 +      <CompileAs>Default</CompileAs>
  10.204 +    </ClCompile>
  10.205 +    <ResourceCompile>
  10.206 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  10.207 +      <Culture>0x0409</Culture>
  10.208 +    </ResourceCompile>
  10.209 +    <Link>
  10.210 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  10.211 +      <GenerateDebugInformation>true</GenerateDebugInformation>
  10.212 +      <SubSystem>Windows</SubSystem>
  10.213 +    </Link>
  10.214 +    <PostBuildEvent>
  10.215 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  10.216      </PostBuildEvent>
  10.217      <PostBuildEvent>
  10.218        <Message>Copy SDL</Message>
  10.219 @@ -136,8 +219,8 @@
  10.220      <ClCompile Include="..\..\..\test\testdraw2.c" />
  10.221    </ItemGroup>
  10.222    <ItemGroup>
  10.223 -    <Library Include="..\..\Sdl\Debug\SDL.lib" />
  10.224 -    <Library Include="..\..\SDLmain\Debug\SDLmain.lib" />
  10.225 +    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
  10.226 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
  10.227    </ItemGroup>
  10.228    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  10.229    <ImportGroup Label="ExtensionTargets">
    11.1 --- a/VisualC/tests/testfile/testfile_VS2010.vcxproj	Tue Apr 19 08:08:50 2011 -0700
    11.2 +++ b/VisualC/tests/testfile/testfile_VS2010.vcxproj	Tue Apr 19 09:53:01 2011 -0700
    11.3 @@ -5,10 +5,18 @@
    11.4        <Configuration>Debug</Configuration>
    11.5        <Platform>Win32</Platform>
    11.6      </ProjectConfiguration>
    11.7 +    <ProjectConfiguration Include="Debug|x64">
    11.8 +      <Configuration>Debug</Configuration>
    11.9 +      <Platform>x64</Platform>
   11.10 +    </ProjectConfiguration>
   11.11      <ProjectConfiguration Include="Release|Win32">
   11.12        <Configuration>Release</Configuration>
   11.13        <Platform>Win32</Platform>
   11.14      </ProjectConfiguration>
   11.15 +    <ProjectConfiguration Include="Release|x64">
   11.16 +      <Configuration>Release</Configuration>
   11.17 +      <Platform>x64</Platform>
   11.18 +    </ProjectConfiguration>
   11.19    </ItemGroup>
   11.20    <PropertyGroup Label="Globals">
   11.21      <ProjectName>testfile</ProjectName>
   11.22 @@ -20,10 +28,19 @@
   11.23      <ConfigurationType>Application</ConfigurationType>
   11.24      <UseOfMfc>false</UseOfMfc>
   11.25    </PropertyGroup>
   11.26 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
   11.27 +    <ConfigurationType>Application</ConfigurationType>
   11.28 +    <UseOfMfc>false</UseOfMfc>
   11.29 +  </PropertyGroup>
   11.30    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
   11.31      <ConfigurationType>Application</ConfigurationType>
   11.32      <UseOfMfc>false</UseOfMfc>
   11.33    </PropertyGroup>
   11.34 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
   11.35 +    <ConfigurationType>Application</ConfigurationType>
   11.36 +    <UseOfMfc>false</UseOfMfc>
   11.37 +    <CharacterSet>MultiByte</CharacterSet>
   11.38 +  </PropertyGroup>
   11.39    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   11.40    <ImportGroup Label="ExtensionSettings">
   11.41    </ImportGroup>
   11.42 @@ -31,19 +48,33 @@
   11.43      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   11.44      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   11.45    </ImportGroup>
   11.46 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
   11.47 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   11.48 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   11.49 +  </ImportGroup>
   11.50    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
   11.51      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   11.52      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   11.53    </ImportGroup>
   11.54 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
   11.55 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   11.56 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   11.57 +  </ImportGroup>
   11.58    <PropertyGroup Label="UserMacros" />
   11.59    <PropertyGroup>
   11.60      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   11.61 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
   11.62 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
   11.63 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
   11.64 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
   11.65 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
   11.66 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
   11.67      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
   11.68 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
   11.69 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
   11.70 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   11.71 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
   11.72 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
   11.73 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
   11.74 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
   11.75      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
   11.76 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   11.77    </PropertyGroup>
   11.78    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   11.79      <Midl>
   11.80 @@ -51,7 +82,6 @@
   11.81        <MkTypLibCompatible>true</MkTypLibCompatible>
   11.82        <SuppressStartupBanner>true</SuppressStartupBanner>
   11.83        <TargetEnvironment>Win32</TargetEnvironment>
   11.84 -      <TypeLibraryName>.\Debug/testfile.tlb</TypeLibraryName>
   11.85      </Midl>
   11.86      <ClCompile>
   11.87        <Optimization>Disabled</Optimization>
   11.88 @@ -60,10 +90,6 @@
   11.89        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   11.90        <PrecompiledHeader>
   11.91        </PrecompiledHeader>
   11.92 -      <PrecompiledHeaderOutputFile>.\Debug/testfile.pch</PrecompiledHeaderOutputFile>
   11.93 -      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
   11.94 -      <ObjectFileName>.\Debug/</ObjectFileName>
   11.95 -      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
   11.96        <WarningLevel>Level3</WarningLevel>
   11.97        <SuppressStartupBanner>true</SuppressStartupBanner>
   11.98        <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
   11.99 @@ -74,15 +100,46 @@
  11.100        <Culture>0x0409</Culture>
  11.101      </ResourceCompile>
  11.102      <Link>
  11.103 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  11.104 -      <OutputFile>.\Debug/testfile.exe</OutputFile>
  11.105        <SuppressStartupBanner>true</SuppressStartupBanner>
  11.106        <GenerateDebugInformation>true</GenerateDebugInformation>
  11.107 -      <ProgramDatabaseFile>.\Debug/testfile.pdb</ProgramDatabaseFile>
  11.108        <SubSystem>Windows</SubSystem>
  11.109      </Link>
  11.110      <PostBuildEvent>
  11.111 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll</Command>
  11.112 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  11.113 +    </PostBuildEvent>
  11.114 +    <PostBuildEvent>
  11.115 +      <Message>Copy SDL</Message>
  11.116 +    </PostBuildEvent>
  11.117 +  </ItemDefinitionGroup>
  11.118 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
  11.119 +    <Midl>
  11.120 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  11.121 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  11.122 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  11.123 +    </Midl>
  11.124 +    <ClCompile>
  11.125 +      <Optimization>Disabled</Optimization>
  11.126 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  11.127 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  11.128 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  11.129 +      <PrecompiledHeader>
  11.130 +      </PrecompiledHeader>
  11.131 +      <WarningLevel>Level3</WarningLevel>
  11.132 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  11.133 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
  11.134 +      <CompileAs>Default</CompileAs>
  11.135 +    </ClCompile>
  11.136 +    <ResourceCompile>
  11.137 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  11.138 +      <Culture>0x0409</Culture>
  11.139 +    </ResourceCompile>
  11.140 +    <Link>
  11.141 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  11.142 +      <GenerateDebugInformation>true</GenerateDebugInformation>
  11.143 +      <SubSystem>Windows</SubSystem>
  11.144 +    </Link>
  11.145 +    <PostBuildEvent>
  11.146 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  11.147      </PostBuildEvent>
  11.148      <PostBuildEvent>
  11.149        <Message>Copy SDL</Message>
  11.150 @@ -94,7 +151,6 @@
  11.151        <MkTypLibCompatible>true</MkTypLibCompatible>
  11.152        <SuppressStartupBanner>true</SuppressStartupBanner>
  11.153        <TargetEnvironment>Win32</TargetEnvironment>
  11.154 -      <TypeLibraryName>.\Release/testfile.tlb</TypeLibraryName>
  11.155      </Midl>
  11.156      <ClCompile>
  11.157        <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
  11.158 @@ -105,10 +161,6 @@
  11.159        <FunctionLevelLinking>true</FunctionLevelLinking>
  11.160        <PrecompiledHeader>
  11.161        </PrecompiledHeader>
  11.162 -      <PrecompiledHeaderOutputFile>.\Release/testfile.pch</PrecompiledHeaderOutputFile>
  11.163 -      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
  11.164 -      <ObjectFileName>.\Release/</ObjectFileName>
  11.165 -      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
  11.166        <WarningLevel>Level3</WarningLevel>
  11.167        <SuppressStartupBanner>true</SuppressStartupBanner>
  11.168        <CompileAs>Default</CompileAs>
  11.169 @@ -118,22 +170,53 @@
  11.170        <Culture>0x0409</Culture>
  11.171      </ResourceCompile>
  11.172      <Link>
  11.173 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  11.174 -      <OutputFile>.\Release/testfile.exe</OutputFile>
  11.175        <SuppressStartupBanner>true</SuppressStartupBanner>
  11.176 -      <ProgramDatabaseFile>.\Release/testfile.pdb</ProgramDatabaseFile>
  11.177        <SubSystem>Windows</SubSystem>
  11.178      </Link>
  11.179      <PostBuildEvent>
  11.180 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll</Command>
  11.181 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  11.182 +    </PostBuildEvent>
  11.183 +    <PostBuildEvent>
  11.184 +      <Message>Copy SDL</Message>
  11.185 +    </PostBuildEvent>
  11.186 +  </ItemDefinitionGroup>
  11.187 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  11.188 +    <Midl>
  11.189 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  11.190 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  11.191 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  11.192 +    </Midl>
  11.193 +    <ClCompile>
  11.194 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
  11.195 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  11.196 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  11.197 +      <StringPooling>true</StringPooling>
  11.198 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  11.199 +      <FunctionLevelLinking>true</FunctionLevelLinking>
  11.200 +      <PrecompiledHeader>
  11.201 +      </PrecompiledHeader>
  11.202 +      <WarningLevel>Level3</WarningLevel>
  11.203 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  11.204 +      <CompileAs>Default</CompileAs>
  11.205 +    </ClCompile>
  11.206 +    <ResourceCompile>
  11.207 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  11.208 +      <Culture>0x0409</Culture>
  11.209 +    </ResourceCompile>
  11.210 +    <Link>
  11.211 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  11.212 +      <SubSystem>Windows</SubSystem>
  11.213 +    </Link>
  11.214 +    <PostBuildEvent>
  11.215 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  11.216      </PostBuildEvent>
  11.217      <PostBuildEvent>
  11.218        <Message>Copy SDL</Message>
  11.219      </PostBuildEvent>
  11.220    </ItemDefinitionGroup>
  11.221    <ItemGroup>
  11.222 -    <Library Include="..\..\Sdl\Debug\SDL.lib" />
  11.223 -    <Library Include="..\..\SDLmain\Debug\SDLmain.lib" />
  11.224 +    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
  11.225 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
  11.226    </ItemGroup>
  11.227    <ItemGroup>
  11.228      <ClCompile Include="..\..\..\Test\testfile.c" />
    12.1 --- a/VisualC/tests/testgamma/testgamma_VS2010.vcxproj	Tue Apr 19 08:08:50 2011 -0700
    12.2 +++ b/VisualC/tests/testgamma/testgamma_VS2010.vcxproj	Tue Apr 19 09:53:01 2011 -0700
    12.3 @@ -5,10 +5,18 @@
    12.4        <Configuration>Debug</Configuration>
    12.5        <Platform>Win32</Platform>
    12.6      </ProjectConfiguration>
    12.7 +    <ProjectConfiguration Include="Debug|x64">
    12.8 +      <Configuration>Debug</Configuration>
    12.9 +      <Platform>x64</Platform>
   12.10 +    </ProjectConfiguration>
   12.11      <ProjectConfiguration Include="Release|Win32">
   12.12        <Configuration>Release</Configuration>
   12.13        <Platform>Win32</Platform>
   12.14      </ProjectConfiguration>
   12.15 +    <ProjectConfiguration Include="Release|x64">
   12.16 +      <Configuration>Release</Configuration>
   12.17 +      <Platform>x64</Platform>
   12.18 +    </ProjectConfiguration>
   12.19    </ItemGroup>
   12.20    <PropertyGroup Label="Globals">
   12.21      <ProjectName>testgamma</ProjectName>
   12.22 @@ -20,10 +28,19 @@
   12.23      <ConfigurationType>Application</ConfigurationType>
   12.24      <UseOfMfc>false</UseOfMfc>
   12.25    </PropertyGroup>
   12.26 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
   12.27 +    <ConfigurationType>Application</ConfigurationType>
   12.28 +    <UseOfMfc>false</UseOfMfc>
   12.29 +  </PropertyGroup>
   12.30    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
   12.31      <ConfigurationType>Application</ConfigurationType>
   12.32      <UseOfMfc>false</UseOfMfc>
   12.33    </PropertyGroup>
   12.34 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
   12.35 +    <ConfigurationType>Application</ConfigurationType>
   12.36 +    <UseOfMfc>false</UseOfMfc>
   12.37 +    <CharacterSet>MultiByte</CharacterSet>
   12.38 +  </PropertyGroup>
   12.39    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   12.40    <ImportGroup Label="ExtensionSettings">
   12.41    </ImportGroup>
   12.42 @@ -31,19 +48,33 @@
   12.43      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   12.44      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   12.45    </ImportGroup>
   12.46 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
   12.47 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   12.48 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   12.49 +  </ImportGroup>
   12.50    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
   12.51      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   12.52      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   12.53    </ImportGroup>
   12.54 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
   12.55 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   12.56 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   12.57 +  </ImportGroup>
   12.58    <PropertyGroup Label="UserMacros" />
   12.59    <PropertyGroup>
   12.60      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   12.61 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
   12.62 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
   12.63 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
   12.64 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
   12.65 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
   12.66 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
   12.67      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
   12.68 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
   12.69 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
   12.70 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   12.71 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
   12.72 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
   12.73 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
   12.74 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
   12.75      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
   12.76 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   12.77    </PropertyGroup>
   12.78    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   12.79      <Midl>
   12.80 @@ -51,7 +82,6 @@
   12.81        <MkTypLibCompatible>true</MkTypLibCompatible>
   12.82        <SuppressStartupBanner>true</SuppressStartupBanner>
   12.83        <TargetEnvironment>Win32</TargetEnvironment>
   12.84 -      <TypeLibraryName>.\Debug/testgamma.tlb</TypeLibraryName>
   12.85      </Midl>
   12.86      <ClCompile>
   12.87        <Optimization>Disabled</Optimization>
   12.88 @@ -60,10 +90,6 @@
   12.89        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   12.90        <PrecompiledHeader>
   12.91        </PrecompiledHeader>
   12.92 -      <PrecompiledHeaderOutputFile>.\Debug/testgamma.pch</PrecompiledHeaderOutputFile>
   12.93 -      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
   12.94 -      <ObjectFileName>.\Debug/</ObjectFileName>
   12.95 -      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
   12.96        <WarningLevel>Level3</WarningLevel>
   12.97        <SuppressStartupBanner>true</SuppressStartupBanner>
   12.98        <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
   12.99 @@ -74,15 +100,47 @@
  12.100        <Culture>0x0409</Culture>
  12.101      </ResourceCompile>
  12.102      <Link>
  12.103 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  12.104 -      <OutputFile>.\Debug/testgamma.exe</OutputFile>
  12.105        <SuppressStartupBanner>true</SuppressStartupBanner>
  12.106        <GenerateDebugInformation>true</GenerateDebugInformation>
  12.107 -      <ProgramDatabaseFile>.\Debug/testgamma.pdb</ProgramDatabaseFile>
  12.108        <SubSystem>Windows</SubSystem>
  12.109      </Link>
  12.110      <PostBuildEvent>
  12.111 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll
  12.112 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
  12.113 +copy $(SolutionDir)\..\test\sample.bmp $(ProjectDir)\sample.bmp</Command>
  12.114 +    </PostBuildEvent>
  12.115 +    <PostBuildEvent>
  12.116 +      <Message>Copy SDL and data files</Message>
  12.117 +    </PostBuildEvent>
  12.118 +  </ItemDefinitionGroup>
  12.119 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
  12.120 +    <Midl>
  12.121 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  12.122 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  12.123 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  12.124 +    </Midl>
  12.125 +    <ClCompile>
  12.126 +      <Optimization>Disabled</Optimization>
  12.127 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  12.128 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  12.129 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  12.130 +      <PrecompiledHeader>
  12.131 +      </PrecompiledHeader>
  12.132 +      <WarningLevel>Level3</WarningLevel>
  12.133 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  12.134 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
  12.135 +      <CompileAs>Default</CompileAs>
  12.136 +    </ClCompile>
  12.137 +    <ResourceCompile>
  12.138 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  12.139 +      <Culture>0x0409</Culture>
  12.140 +    </ResourceCompile>
  12.141 +    <Link>
  12.142 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  12.143 +      <GenerateDebugInformation>true</GenerateDebugInformation>
  12.144 +      <SubSystem>Windows</SubSystem>
  12.145 +    </Link>
  12.146 +    <PostBuildEvent>
  12.147 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
  12.148  copy $(SolutionDir)\..\test\sample.bmp $(ProjectDir)\sample.bmp</Command>
  12.149      </PostBuildEvent>
  12.150      <PostBuildEvent>
  12.151 @@ -95,7 +153,6 @@
  12.152        <MkTypLibCompatible>true</MkTypLibCompatible>
  12.153        <SuppressStartupBanner>true</SuppressStartupBanner>
  12.154        <TargetEnvironment>Win32</TargetEnvironment>
  12.155 -      <TypeLibraryName>.\Release/testgamma.tlb</TypeLibraryName>
  12.156      </Midl>
  12.157      <ClCompile>
  12.158        <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
  12.159 @@ -106,10 +163,6 @@
  12.160        <FunctionLevelLinking>true</FunctionLevelLinking>
  12.161        <PrecompiledHeader>
  12.162        </PrecompiledHeader>
  12.163 -      <PrecompiledHeaderOutputFile>.\Release/testgamma.pch</PrecompiledHeaderOutputFile>
  12.164 -      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
  12.165 -      <ObjectFileName>.\Release/</ObjectFileName>
  12.166 -      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
  12.167        <WarningLevel>Level3</WarningLevel>
  12.168        <SuppressStartupBanner>true</SuppressStartupBanner>
  12.169        <CompileAs>Default</CompileAs>
  12.170 @@ -119,14 +172,46 @@
  12.171        <Culture>0x0409</Culture>
  12.172      </ResourceCompile>
  12.173      <Link>
  12.174 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  12.175 -      <OutputFile>.\Release/testgamma.exe</OutputFile>
  12.176        <SuppressStartupBanner>true</SuppressStartupBanner>
  12.177 -      <ProgramDatabaseFile>.\Release/testgamma.pdb</ProgramDatabaseFile>
  12.178        <SubSystem>Windows</SubSystem>
  12.179      </Link>
  12.180      <PostBuildEvent>
  12.181 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll
  12.182 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
  12.183 +copy $(SolutionDir)\..\test\sample.bmp $(ProjectDir)\sample.bmp</Command>
  12.184 +    </PostBuildEvent>
  12.185 +    <PostBuildEvent>
  12.186 +      <Message>Copy SDL and data files</Message>
  12.187 +    </PostBuildEvent>
  12.188 +  </ItemDefinitionGroup>
  12.189 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  12.190 +    <Midl>
  12.191 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  12.192 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  12.193 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  12.194 +    </Midl>
  12.195 +    <ClCompile>
  12.196 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
  12.197 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  12.198 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  12.199 +      <StringPooling>true</StringPooling>
  12.200 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  12.201 +      <FunctionLevelLinking>true</FunctionLevelLinking>
  12.202 +      <PrecompiledHeader>
  12.203 +      </PrecompiledHeader>
  12.204 +      <WarningLevel>Level3</WarningLevel>
  12.205 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  12.206 +      <CompileAs>Default</CompileAs>
  12.207 +    </ClCompile>
  12.208 +    <ResourceCompile>
  12.209 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  12.210 +      <Culture>0x0409</Culture>
  12.211 +    </ResourceCompile>
  12.212 +    <Link>
  12.213 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  12.214 +      <SubSystem>Windows</SubSystem>
  12.215 +    </Link>
  12.216 +    <PostBuildEvent>
  12.217 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
  12.218  copy $(SolutionDir)\..\test\sample.bmp $(ProjectDir)\sample.bmp</Command>
  12.219      </PostBuildEvent>
  12.220      <PostBuildEvent>
  12.221 @@ -134,8 +219,8 @@
  12.222      </PostBuildEvent>
  12.223    </ItemDefinitionGroup>
  12.224    <ItemGroup>
  12.225 -    <Library Include="..\..\Sdl\Debug\SDL.lib" />
  12.226 -    <Library Include="..\..\SDLmain\Debug\SDLmain.lib" />
  12.227 +    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
  12.228 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
  12.229    </ItemGroup>
  12.230    <ItemGroup>
  12.231      <ClCompile Include="..\..\..\test\testgamma.c" />
    13.1 --- a/VisualC/tests/testgl/testgl_VS2010.vcxproj	Tue Apr 19 08:08:50 2011 -0700
    13.2 +++ b/VisualC/tests/testgl/testgl_VS2010.vcxproj	Tue Apr 19 09:53:01 2011 -0700
    13.3 @@ -5,10 +5,18 @@
    13.4        <Configuration>Debug</Configuration>
    13.5        <Platform>Win32</Platform>
    13.6      </ProjectConfiguration>
    13.7 +    <ProjectConfiguration Include="Debug|x64">
    13.8 +      <Configuration>Debug</Configuration>
    13.9 +      <Platform>x64</Platform>
   13.10 +    </ProjectConfiguration>
   13.11      <ProjectConfiguration Include="Release|Win32">
   13.12        <Configuration>Release</Configuration>
   13.13        <Platform>Win32</Platform>
   13.14      </ProjectConfiguration>
   13.15 +    <ProjectConfiguration Include="Release|x64">
   13.16 +      <Configuration>Release</Configuration>
   13.17 +      <Platform>x64</Platform>
   13.18 +    </ProjectConfiguration>
   13.19    </ItemGroup>
   13.20    <PropertyGroup Label="Globals">
   13.21      <ProjectName>testgl</ProjectName>
   13.22 @@ -20,10 +28,19 @@
   13.23      <ConfigurationType>Application</ConfigurationType>
   13.24      <UseOfMfc>false</UseOfMfc>
   13.25    </PropertyGroup>
   13.26 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
   13.27 +    <ConfigurationType>Application</ConfigurationType>
   13.28 +    <UseOfMfc>false</UseOfMfc>
   13.29 +  </PropertyGroup>
   13.30    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
   13.31      <ConfigurationType>Application</ConfigurationType>
   13.32      <UseOfMfc>false</UseOfMfc>
   13.33    </PropertyGroup>
   13.34 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
   13.35 +    <ConfigurationType>Application</ConfigurationType>
   13.36 +    <UseOfMfc>false</UseOfMfc>
   13.37 +    <CharacterSet>MultiByte</CharacterSet>
   13.38 +  </PropertyGroup>
   13.39    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   13.40    <ImportGroup Label="ExtensionSettings">
   13.41    </ImportGroup>
   13.42 @@ -31,19 +48,33 @@
   13.43      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   13.44      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   13.45    </ImportGroup>
   13.46 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
   13.47 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   13.48 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   13.49 +  </ImportGroup>
   13.50    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
   13.51      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   13.52      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   13.53    </ImportGroup>
   13.54 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
   13.55 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   13.56 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   13.57 +  </ImportGroup>
   13.58    <PropertyGroup Label="UserMacros" />
   13.59    <PropertyGroup>
   13.60      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   13.61 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
   13.62 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
   13.63 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
   13.64 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
   13.65 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
   13.66 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
   13.67      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
   13.68 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
   13.69 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
   13.70 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   13.71 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
   13.72 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
   13.73 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
   13.74 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
   13.75      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
   13.76 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   13.77    </PropertyGroup>
   13.78    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   13.79      <Midl>
   13.80 @@ -51,7 +82,6 @@
   13.81        <MkTypLibCompatible>true</MkTypLibCompatible>
   13.82        <SuppressStartupBanner>true</SuppressStartupBanner>
   13.83        <TargetEnvironment>Win32</TargetEnvironment>
   13.84 -      <TypeLibraryName>.\Debug/testgl.tlb</TypeLibraryName>
   13.85      </Midl>
   13.86      <ClCompile>
   13.87        <Optimization>Disabled</Optimization>
   13.88 @@ -60,10 +90,6 @@
   13.89        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   13.90        <PrecompiledHeader>
   13.91        </PrecompiledHeader>
   13.92 -      <PrecompiledHeaderOutputFile>.\Debug/testgl.pch</PrecompiledHeaderOutputFile>
   13.93 -      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
   13.94 -      <ObjectFileName>.\Debug/</ObjectFileName>
   13.95 -      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
   13.96        <WarningLevel>Level3</WarningLevel>
   13.97        <SuppressStartupBanner>true</SuppressStartupBanner>
   13.98        <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
   13.99 @@ -74,16 +100,48 @@
  13.100        <Culture>0x0409</Culture>
  13.101      </ResourceCompile>
  13.102      <Link>
  13.103 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  13.104        <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
  13.105 -      <OutputFile>.\Debug/testgl.exe</OutputFile>
  13.106        <SuppressStartupBanner>true</SuppressStartupBanner>
  13.107        <GenerateDebugInformation>true</GenerateDebugInformation>
  13.108 -      <ProgramDatabaseFile>.\Debug/testgl.pdb</ProgramDatabaseFile>
  13.109        <SubSystem>Windows</SubSystem>
  13.110      </Link>
  13.111      <PostBuildEvent>
  13.112 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll</Command>
  13.113 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  13.114 +    </PostBuildEvent>
  13.115 +    <PostBuildEvent>
  13.116 +      <Message>Copy SDL</Message>
  13.117 +    </PostBuildEvent>
  13.118 +  </ItemDefinitionGroup>
  13.119 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
  13.120 +    <Midl>
  13.121 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  13.122 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  13.123 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  13.124 +    </Midl>
  13.125 +    <ClCompile>
  13.126 +      <Optimization>Disabled</Optimization>
  13.127 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  13.128 +      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;HAVE_OPENGL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  13.129 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  13.130 +      <PrecompiledHeader>
  13.131 +      </PrecompiledHeader>
  13.132 +      <WarningLevel>Level3</WarningLevel>
  13.133 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  13.134 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
  13.135 +      <CompileAs>Default</CompileAs>
  13.136 +    </ClCompile>
  13.137 +    <ResourceCompile>
  13.138 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  13.139 +      <Culture>0x0409</Culture>
  13.140 +    </ResourceCompile>
  13.141 +    <Link>
  13.142 +      <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
  13.143 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  13.144 +      <GenerateDebugInformation>true</GenerateDebugInformation>
  13.145 +      <SubSystem>Windows</SubSystem>
  13.146 +    </Link>
  13.147 +    <PostBuildEvent>
  13.148 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  13.149      </PostBuildEvent>
  13.150      <PostBuildEvent>
  13.151        <Message>Copy SDL</Message>
  13.152 @@ -95,7 +153,6 @@
  13.153        <MkTypLibCompatible>true</MkTypLibCompatible>
  13.154        <SuppressStartupBanner>true</SuppressStartupBanner>
  13.155        <TargetEnvironment>Win32</TargetEnvironment>
  13.156 -      <TypeLibraryName>.\Release/testgl.tlb</TypeLibraryName>
  13.157      </Midl>
  13.158      <ClCompile>
  13.159        <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
  13.160 @@ -106,10 +163,6 @@
  13.161        <FunctionLevelLinking>true</FunctionLevelLinking>
  13.162        <PrecompiledHeader>
  13.163        </PrecompiledHeader>
  13.164 -      <PrecompiledHeaderOutputFile>.\Release/testgl.pch</PrecompiledHeaderOutputFile>
  13.165 -      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
  13.166 -      <ObjectFileName>.\Release/</ObjectFileName>
  13.167 -      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
  13.168        <WarningLevel>Level3</WarningLevel>
  13.169        <SuppressStartupBanner>true</SuppressStartupBanner>
  13.170        <CompileAs>Default</CompileAs>
  13.171 @@ -119,23 +172,55 @@
  13.172        <Culture>0x0409</Culture>
  13.173      </ResourceCompile>
  13.174      <Link>
  13.175 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  13.176        <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
  13.177 -      <OutputFile>.\Release/testgl.exe</OutputFile>
  13.178        <SuppressStartupBanner>true</SuppressStartupBanner>
  13.179 -      <ProgramDatabaseFile>.\Release/testgl.pdb</ProgramDatabaseFile>
  13.180        <SubSystem>Windows</SubSystem>
  13.181      </Link>
  13.182      <PostBuildEvent>
  13.183 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll</Command>
  13.184 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  13.185 +    </PostBuildEvent>
  13.186 +    <PostBuildEvent>
  13.187 +      <Message>Copy SDL</Message>
  13.188 +    </PostBuildEvent>
  13.189 +  </ItemDefinitionGroup>
  13.190 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  13.191 +    <Midl>
  13.192 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  13.193 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  13.194 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  13.195 +    </Midl>
  13.196 +    <ClCompile>
  13.197 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
  13.198 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  13.199 +      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;HAVE_OPENGL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  13.200 +      <StringPooling>true</StringPooling>
  13.201 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  13.202 +      <FunctionLevelLinking>true</FunctionLevelLinking>
  13.203 +      <PrecompiledHeader>
  13.204 +      </PrecompiledHeader>
  13.205 +      <WarningLevel>Level3</WarningLevel>
  13.206 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  13.207 +      <CompileAs>Default</CompileAs>
  13.208 +    </ClCompile>
  13.209 +    <ResourceCompile>
  13.210 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  13.211 +      <Culture>0x0409</Culture>
  13.212 +    </ResourceCompile>
  13.213 +    <Link>
  13.214 +      <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
  13.215 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  13.216 +      <SubSystem>Windows</SubSystem>
  13.217 +    </Link>
  13.218 +    <PostBuildEvent>
  13.219 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  13.220      </PostBuildEvent>
  13.221      <PostBuildEvent>
  13.222        <Message>Copy SDL</Message>
  13.223      </PostBuildEvent>
  13.224    </ItemDefinitionGroup>
  13.225    <ItemGroup>
  13.226 -    <Library Include="..\..\Sdl\Debug\SDL.lib" />
  13.227 -    <Library Include="..\..\SDLmain\Debug\SDLmain.lib" />
  13.228 +    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
  13.229 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
  13.230    </ItemGroup>
  13.231    <ItemGroup>
  13.232      <ClCompile Include="..\..\..\test\testgl.c" />
    14.1 --- a/VisualC/tests/testgl2/testgl2_VS2010.vcxproj	Tue Apr 19 08:08:50 2011 -0700
    14.2 +++ b/VisualC/tests/testgl2/testgl2_VS2010.vcxproj	Tue Apr 19 09:53:01 2011 -0700
    14.3 @@ -5,10 +5,18 @@
    14.4        <Configuration>Debug</Configuration>
    14.5        <Platform>Win32</Platform>
    14.6      </ProjectConfiguration>
    14.7 +    <ProjectConfiguration Include="Debug|x64">
    14.8 +      <Configuration>Debug</Configuration>
    14.9 +      <Platform>x64</Platform>
   14.10 +    </ProjectConfiguration>
   14.11      <ProjectConfiguration Include="Release|Win32">
   14.12        <Configuration>Release</Configuration>
   14.13        <Platform>Win32</Platform>
   14.14      </ProjectConfiguration>
   14.15 +    <ProjectConfiguration Include="Release|x64">
   14.16 +      <Configuration>Release</Configuration>
   14.17 +      <Platform>x64</Platform>
   14.18 +    </ProjectConfiguration>
   14.19    </ItemGroup>
   14.20    <PropertyGroup Label="Globals">
   14.21      <ProjectName>testgl2</ProjectName>
   14.22 @@ -20,10 +28,19 @@
   14.23      <ConfigurationType>Application</ConfigurationType>
   14.24      <UseOfMfc>false</UseOfMfc>
   14.25    </PropertyGroup>
   14.26 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
   14.27 +    <ConfigurationType>Application</ConfigurationType>
   14.28 +    <UseOfMfc>false</UseOfMfc>
   14.29 +  </PropertyGroup>
   14.30    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
   14.31      <ConfigurationType>Application</ConfigurationType>
   14.32      <UseOfMfc>false</UseOfMfc>
   14.33    </PropertyGroup>
   14.34 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
   14.35 +    <ConfigurationType>Application</ConfigurationType>
   14.36 +    <UseOfMfc>false</UseOfMfc>
   14.37 +    <CharacterSet>MultiByte</CharacterSet>
   14.38 +  </PropertyGroup>
   14.39    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   14.40    <ImportGroup Label="ExtensionSettings">
   14.41    </ImportGroup>
   14.42 @@ -31,19 +48,33 @@
   14.43      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   14.44      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   14.45    </ImportGroup>
   14.46 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
   14.47 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   14.48 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   14.49 +  </ImportGroup>
   14.50    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
   14.51      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   14.52      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   14.53    </ImportGroup>
   14.54 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
   14.55 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   14.56 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   14.57 +  </ImportGroup>
   14.58    <PropertyGroup Label="UserMacros" />
   14.59    <PropertyGroup>
   14.60      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   14.61 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
   14.62 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
   14.63 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
   14.64 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
   14.65 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
   14.66 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
   14.67      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
   14.68 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
   14.69 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
   14.70 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   14.71 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
   14.72 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
   14.73 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
   14.74 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
   14.75      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
   14.76 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   14.77    </PropertyGroup>
   14.78    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   14.79      <Midl>
   14.80 @@ -51,7 +82,6 @@
   14.81        <MkTypLibCompatible>true</MkTypLibCompatible>
   14.82        <SuppressStartupBanner>true</SuppressStartupBanner>
   14.83        <TargetEnvironment>Win32</TargetEnvironment>
   14.84 -      <TypeLibraryName>.\Debug/testgl2.tlb</TypeLibraryName>
   14.85      </Midl>
   14.86      <ClCompile>
   14.87        <Optimization>Disabled</Optimization>
   14.88 @@ -60,10 +90,6 @@
   14.89        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   14.90        <PrecompiledHeader>
   14.91        </PrecompiledHeader>
   14.92 -      <PrecompiledHeaderOutputFile>.\Debug/testgl2.pch</PrecompiledHeaderOutputFile>
   14.93 -      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
   14.94 -      <ObjectFileName>.\Debug/</ObjectFileName>
   14.95 -      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
   14.96        <WarningLevel>Level3</WarningLevel>
   14.97        <SuppressStartupBanner>true</SuppressStartupBanner>
   14.98        <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
   14.99 @@ -74,16 +100,48 @@
  14.100        <Culture>0x0409</Culture>
  14.101      </ResourceCompile>
  14.102      <Link>
  14.103 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  14.104        <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
  14.105 -      <OutputFile>.\Debug/testgl2.exe</OutputFile>
  14.106        <SuppressStartupBanner>true</SuppressStartupBanner>
  14.107        <GenerateDebugInformation>true</GenerateDebugInformation>
  14.108 -      <ProgramDatabaseFile>.\Debug/testgl2.pdb</ProgramDatabaseFile>
  14.109        <SubSystem>Windows</SubSystem>
  14.110      </Link>
  14.111      <PostBuildEvent>
  14.112 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll</Command>
  14.113 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  14.114 +    </PostBuildEvent>
  14.115 +    <PostBuildEvent>
  14.116 +      <Message>Copy SDL</Message>
  14.117 +    </PostBuildEvent>
  14.118 +  </ItemDefinitionGroup>
  14.119 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
  14.120 +    <Midl>
  14.121 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  14.122 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  14.123 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  14.124 +    </Midl>
  14.125 +    <ClCompile>
  14.126 +      <Optimization>Disabled</Optimization>
  14.127 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  14.128 +      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;HAVE_OPENGL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  14.129 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  14.130 +      <PrecompiledHeader>
  14.131 +      </PrecompiledHeader>
  14.132 +      <WarningLevel>Level3</WarningLevel>
  14.133 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  14.134 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
  14.135 +      <CompileAs>Default</CompileAs>
  14.136 +    </ClCompile>
  14.137 +    <ResourceCompile>
  14.138 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  14.139 +      <Culture>0x0409</Culture>
  14.140 +    </ResourceCompile>
  14.141 +    <Link>
  14.142 +      <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
  14.143 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  14.144 +      <GenerateDebugInformation>true</GenerateDebugInformation>
  14.145 +      <SubSystem>Windows</SubSystem>
  14.146 +    </Link>
  14.147 +    <PostBuildEvent>
  14.148 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  14.149      </PostBuildEvent>
  14.150      <PostBuildEvent>
  14.151        <Message>Copy SDL</Message>
  14.152 @@ -95,7 +153,6 @@
  14.153        <MkTypLibCompatible>true</MkTypLibCompatible>
  14.154        <SuppressStartupBanner>true</SuppressStartupBanner>
  14.155        <TargetEnvironment>Win32</TargetEnvironment>
  14.156 -      <TypeLibraryName>.\Release/testgl2.tlb</TypeLibraryName>
  14.157      </Midl>
  14.158      <ClCompile>
  14.159        <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
  14.160 @@ -106,10 +163,6 @@
  14.161        <FunctionLevelLinking>true</FunctionLevelLinking>
  14.162        <PrecompiledHeader>
  14.163        </PrecompiledHeader>
  14.164 -      <PrecompiledHeaderOutputFile>.\Release/testgl2.pch</PrecompiledHeaderOutputFile>
  14.165 -      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
  14.166 -      <ObjectFileName>.\Release/</ObjectFileName>
  14.167 -      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
  14.168        <WarningLevel>Level3</WarningLevel>
  14.169        <SuppressStartupBanner>true</SuppressStartupBanner>
  14.170        <CompileAs>Default</CompileAs>
  14.171 @@ -119,15 +172,47 @@
  14.172        <Culture>0x0409</Culture>
  14.173      </ResourceCompile>
  14.174      <Link>
  14.175 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  14.176        <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
  14.177 -      <OutputFile>.\Release/testgl2.exe</OutputFile>
  14.178        <SuppressStartupBanner>true</SuppressStartupBanner>
  14.179 -      <ProgramDatabaseFile>.\Release/testgl2.pdb</ProgramDatabaseFile>
  14.180        <SubSystem>Windows</SubSystem>
  14.181      </Link>
  14.182      <PostBuildEvent>
  14.183 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll</Command>
  14.184 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  14.185 +    </PostBuildEvent>
  14.186 +    <PostBuildEvent>
  14.187 +      <Message>Copy SDL</Message>
  14.188 +    </PostBuildEvent>
  14.189 +  </ItemDefinitionGroup>
  14.190 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  14.191 +    <Midl>
  14.192 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  14.193 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  14.194 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  14.195 +    </Midl>
  14.196 +    <ClCompile>
  14.197 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
  14.198 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  14.199 +      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;HAVE_OPENGL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  14.200 +      <StringPooling>true</StringPooling>
  14.201 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  14.202 +      <FunctionLevelLinking>true</FunctionLevelLinking>
  14.203 +      <PrecompiledHeader>
  14.204 +      </PrecompiledHeader>
  14.205 +      <WarningLevel>Level3</WarningLevel>
  14.206 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  14.207 +      <CompileAs>Default</CompileAs>
  14.208 +    </ClCompile>
  14.209 +    <ResourceCompile>
  14.210 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  14.211 +      <Culture>0x0409</Culture>
  14.212 +    </ResourceCompile>
  14.213 +    <Link>
  14.214 +      <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
  14.215 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  14.216 +      <SubSystem>Windows</SubSystem>
  14.217 +    </Link>
  14.218 +    <PostBuildEvent>
  14.219 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  14.220      </PostBuildEvent>
  14.221      <PostBuildEvent>
  14.222        <Message>Copy SDL</Message>
  14.223 @@ -138,8 +223,8 @@
  14.224      <ClCompile Include="..\..\..\test\testgl2.c" />
  14.225    </ItemGroup>
  14.226    <ItemGroup>
  14.227 -    <Library Include="..\..\Sdl\Debug\SDL.lib" />
  14.228 -    <Library Include="..\..\SDLmain\Debug\SDLmain.lib" />
  14.229 +    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
  14.230 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
  14.231    </ItemGroup>
  14.232    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  14.233    <ImportGroup Label="ExtensionTargets">
    15.1 --- a/VisualC/tests/testjoystick/testjoystick_VS2010.vcxproj	Tue Apr 19 08:08:50 2011 -0700
    15.2 +++ b/VisualC/tests/testjoystick/testjoystick_VS2010.vcxproj	Tue Apr 19 09:53:01 2011 -0700
    15.3 @@ -5,10 +5,18 @@
    15.4        <Configuration>Debug</Configuration>
    15.5        <Platform>Win32</Platform>
    15.6      </ProjectConfiguration>
    15.7 +    <ProjectConfiguration Include="Debug|x64">
    15.8 +      <Configuration>Debug</Configuration>
    15.9 +      <Platform>x64</Platform>
   15.10 +    </ProjectConfiguration>
   15.11      <ProjectConfiguration Include="Release|Win32">
   15.12        <Configuration>Release</Configuration>
   15.13        <Platform>Win32</Platform>
   15.14      </ProjectConfiguration>
   15.15 +    <ProjectConfiguration Include="Release|x64">
   15.16 +      <Configuration>Release</Configuration>
   15.17 +      <Platform>x64</Platform>
   15.18 +    </ProjectConfiguration>
   15.19    </ItemGroup>
   15.20    <PropertyGroup Label="Globals">
   15.21      <ProjectName>testjoystick</ProjectName>
   15.22 @@ -20,10 +28,19 @@
   15.23      <ConfigurationType>Application</ConfigurationType>
   15.24      <UseOfMfc>false</UseOfMfc>
   15.25    </PropertyGroup>
   15.26 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
   15.27 +    <ConfigurationType>Application</ConfigurationType>
   15.28 +    <UseOfMfc>false</UseOfMfc>
   15.29 +    <CharacterSet>MultiByte</CharacterSet>
   15.30 +  </PropertyGroup>
   15.31    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
   15.32      <ConfigurationType>Application</ConfigurationType>
   15.33      <UseOfMfc>false</UseOfMfc>
   15.34    </PropertyGroup>
   15.35 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
   15.36 +    <ConfigurationType>Application</ConfigurationType>
   15.37 +    <UseOfMfc>false</UseOfMfc>
   15.38 +  </PropertyGroup>
   15.39    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   15.40    <ImportGroup Label="ExtensionSettings">
   15.41    </ImportGroup>
   15.42 @@ -31,19 +48,33 @@
   15.43      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   15.44      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   15.45    </ImportGroup>
   15.46 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
   15.47 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   15.48 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   15.49 +  </ImportGroup>
   15.50    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
   15.51      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   15.52      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   15.53    </ImportGroup>
   15.54 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
   15.55 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   15.56 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   15.57 +  </ImportGroup>
   15.58    <PropertyGroup Label="UserMacros" />
   15.59    <PropertyGroup>
   15.60      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   15.61 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
   15.62 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
   15.63 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
   15.64 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
   15.65 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
   15.66 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
   15.67      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
   15.68 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
   15.69 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
   15.70 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   15.71 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
   15.72 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
   15.73 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
   15.74 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
   15.75      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
   15.76 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   15.77    </PropertyGroup>
   15.78    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   15.79      <Midl>
   15.80 @@ -51,7 +82,6 @@
   15.81        <MkTypLibCompatible>true</MkTypLibCompatible>
   15.82        <SuppressStartupBanner>true</SuppressStartupBanner>
   15.83        <TargetEnvironment>Win32</TargetEnvironment>
   15.84 -      <TypeLibraryName>.\Release/testjoystick.tlb</TypeLibraryName>
   15.85      </Midl>
   15.86      <ClCompile>
   15.87        <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
   15.88 @@ -62,10 +92,6 @@
   15.89        <FunctionLevelLinking>true</FunctionLevelLinking>
   15.90        <PrecompiledHeader>
   15.91        </PrecompiledHeader>
   15.92 -      <PrecompiledHeaderOutputFile>.\Release/testjoystick.pch</PrecompiledHeaderOutputFile>
   15.93 -      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
   15.94 -      <ObjectFileName>.\Release/</ObjectFileName>
   15.95 -      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
   15.96        <WarningLevel>Level3</WarningLevel>
   15.97        <SuppressStartupBanner>true</SuppressStartupBanner>
   15.98        <CompileAs>Default</CompileAs>
   15.99 @@ -75,14 +101,45 @@
  15.100        <Culture>0x0409</Culture>
  15.101      </ResourceCompile>
  15.102      <Link>
  15.103 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  15.104 -      <OutputFile>.\Release/testjoystick.exe</OutputFile>
  15.105        <SuppressStartupBanner>true</SuppressStartupBanner>
  15.106 -      <ProgramDatabaseFile>.\Release/testjoystick.pdb</ProgramDatabaseFile>
  15.107        <SubSystem>Windows</SubSystem>
  15.108      </Link>
  15.109      <PostBuildEvent>
  15.110 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll</Command>
  15.111 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  15.112 +    </PostBuildEvent>
  15.113 +    <PostBuildEvent>
  15.114 +      <Message>Copy SDL</Message>
  15.115 +    </PostBuildEvent>
  15.116 +  </ItemDefinitionGroup>
  15.117 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  15.118 +    <Midl>
  15.119 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  15.120 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  15.121 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  15.122 +    </Midl>
  15.123 +    <ClCompile>
  15.124 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
  15.125 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  15.126 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  15.127 +      <StringPooling>true</StringPooling>
  15.128 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  15.129 +      <FunctionLevelLinking>true</FunctionLevelLinking>
  15.130 +      <PrecompiledHeader>
  15.131 +      </PrecompiledHeader>
  15.132 +      <WarningLevel>Level3</WarningLevel>
  15.133 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  15.134 +      <CompileAs>Default</CompileAs>
  15.135 +    </ClCompile>
  15.136 +    <ResourceCompile>
  15.137 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  15.138 +      <Culture>0x0409</Culture>
  15.139 +    </ResourceCompile>
  15.140 +    <Link>
  15.141 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  15.142 +      <SubSystem>Windows</SubSystem>
  15.143 +    </Link>
  15.144 +    <PostBuildEvent>
  15.145 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  15.146      </PostBuildEvent>
  15.147      <PostBuildEvent>
  15.148        <Message>Copy SDL</Message>
  15.149 @@ -94,7 +151,6 @@
  15.150        <MkTypLibCompatible>true</MkTypLibCompatible>
  15.151        <SuppressStartupBanner>true</SuppressStartupBanner>
  15.152        <TargetEnvironment>Win32</TargetEnvironment>
  15.153 -      <TypeLibraryName>.\Debug/testjoystick.tlb</TypeLibraryName>
  15.154      </Midl>
  15.155      <ClCompile>
  15.156        <Optimization>Disabled</Optimization>
  15.157 @@ -103,10 +159,6 @@
  15.158        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  15.159        <PrecompiledHeader>
  15.160        </PrecompiledHeader>
  15.161 -      <PrecompiledHeaderOutputFile>.\Debug/testjoystick.pch</PrecompiledHeaderOutputFile>
  15.162 -      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
  15.163 -      <ObjectFileName>.\Debug/</ObjectFileName>
  15.164 -      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
  15.165        <WarningLevel>Level3</WarningLevel>
  15.166        <SuppressStartupBanner>true</SuppressStartupBanner>
  15.167        <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
  15.168 @@ -117,23 +169,54 @@
  15.169        <Culture>0x0409</Culture>
  15.170      </ResourceCompile>
  15.171      <Link>
  15.172 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  15.173 -      <OutputFile>.\Debug/testjoystick.exe</OutputFile>
  15.174        <SuppressStartupBanner>true</SuppressStartupBanner>
  15.175        <GenerateDebugInformation>true</GenerateDebugInformation>
  15.176 -      <ProgramDatabaseFile>.\Debug/testjoystick.pdb</ProgramDatabaseFile>
  15.177        <SubSystem>Windows</SubSystem>
  15.178      </Link>
  15.179      <PostBuildEvent>
  15.180 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll</Command>
  15.181 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  15.182 +    </PostBuildEvent>
  15.183 +    <PostBuildEvent>
  15.184 +      <Message>Copy SDL</Message>
  15.185 +    </PostBuildEvent>
  15.186 +  </ItemDefinitionGroup>
  15.187 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
  15.188 +    <Midl>
  15.189 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  15.190 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  15.191 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  15.192 +    </Midl>
  15.193 +    <ClCompile>
  15.194 +      <Optimization>Disabled</Optimization>
  15.195 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  15.196 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  15.197 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  15.198 +      <PrecompiledHeader>
  15.199 +      </PrecompiledHeader>
  15.200 +      <WarningLevel>Level3</WarningLevel>
  15.201 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  15.202 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
  15.203 +      <CompileAs>Default</CompileAs>
  15.204 +    </ClCompile>
  15.205 +    <ResourceCompile>
  15.206 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  15.207 +      <Culture>0x0409</Culture>
  15.208 +    </ResourceCompile>
  15.209 +    <Link>
  15.210 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  15.211 +      <GenerateDebugInformation>true</GenerateDebugInformation>
  15.212 +      <SubSystem>Windows</SubSystem>
  15.213 +    </Link>
  15.214 +    <PostBuildEvent>
  15.215 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  15.216      </PostBuildEvent>
  15.217      <PostBuildEvent>
  15.218        <Message>Copy SDL</Message>
  15.219      </PostBuildEvent>
  15.220    </ItemDefinitionGroup>
  15.221    <ItemGroup>
  15.222 -    <Library Include="..\..\Sdl\Debug\SDL.lib" />
  15.223 -    <Library Include="..\..\SDLmain\Debug\SDLmain.lib" />
  15.224 +    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
  15.225 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
  15.226    </ItemGroup>
  15.227    <ItemGroup>
  15.228      <ClCompile Include="..\..\..\test\testjoystick.c" />
    16.1 --- a/VisualC/tests/testoverlay/testoverlay_VS2010.vcxproj	Tue Apr 19 08:08:50 2011 -0700
    16.2 +++ b/VisualC/tests/testoverlay/testoverlay_VS2010.vcxproj	Tue Apr 19 09:53:01 2011 -0700
    16.3 @@ -5,10 +5,18 @@
    16.4        <Configuration>Debug</Configuration>
    16.5        <Platform>Win32</Platform>
    16.6      </ProjectConfiguration>
    16.7 +    <ProjectConfiguration Include="Debug|x64">
    16.8 +      <Configuration>Debug</Configuration>
    16.9 +      <Platform>x64</Platform>
   16.10 +    </ProjectConfiguration>
   16.11      <ProjectConfiguration Include="Release|Win32">
   16.12        <Configuration>Release</Configuration>
   16.13        <Platform>Win32</Platform>
   16.14      </ProjectConfiguration>
   16.15 +    <ProjectConfiguration Include="Release|x64">
   16.16 +      <Configuration>Release</Configuration>
   16.17 +      <Platform>x64</Platform>
   16.18 +    </ProjectConfiguration>
   16.19    </ItemGroup>
   16.20    <PropertyGroup Label="Globals">
   16.21      <ProjectName>testoverlay</ProjectName>
   16.22 @@ -20,10 +28,19 @@
   16.23      <ConfigurationType>Application</ConfigurationType>
   16.24      <UseOfMfc>false</UseOfMfc>
   16.25    </PropertyGroup>
   16.26 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
   16.27 +    <ConfigurationType>Application</ConfigurationType>
   16.28 +    <UseOfMfc>false</UseOfMfc>
   16.29 +    <CharacterSet>MultiByte</CharacterSet>
   16.30 +  </PropertyGroup>
   16.31    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
   16.32      <ConfigurationType>Application</ConfigurationType>
   16.33      <UseOfMfc>false</UseOfMfc>
   16.34    </PropertyGroup>
   16.35 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
   16.36 +    <ConfigurationType>Application</ConfigurationType>
   16.37 +    <UseOfMfc>false</UseOfMfc>
   16.38 +  </PropertyGroup>
   16.39    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   16.40    <ImportGroup Label="ExtensionSettings">
   16.41    </ImportGroup>
   16.42 @@ -31,19 +48,33 @@
   16.43      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   16.44      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   16.45    </ImportGroup>
   16.46 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
   16.47 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   16.48 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   16.49 +  </ImportGroup>
   16.50    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
   16.51      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   16.52      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   16.53    </ImportGroup>
   16.54 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
   16.55 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   16.56 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   16.57 +  </ImportGroup>
   16.58    <PropertyGroup Label="UserMacros" />
   16.59    <PropertyGroup>
   16.60      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   16.61 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
   16.62 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
   16.63 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
   16.64 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
   16.65 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
   16.66 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
   16.67      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
   16.68 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
   16.69 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
   16.70 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   16.71 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
   16.72 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
   16.73 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
   16.74 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
   16.75      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
   16.76 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   16.77    </PropertyGroup>
   16.78    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   16.79      <Midl>
   16.80 @@ -62,10 +93,6 @@
   16.81        <FunctionLevelLinking>true</FunctionLevelLinking>
   16.82        <PrecompiledHeader>
   16.83        </PrecompiledHeader>
   16.84 -      <PrecompiledHeaderOutputFile>.\Release/testoverlay.pch</PrecompiledHeaderOutputFile>
   16.85 -      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
   16.86 -      <ObjectFileName>.\Release/</ObjectFileName>
   16.87 -      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
   16.88        <WarningLevel>Level3</WarningLevel>
   16.89        <SuppressStartupBanner>true</SuppressStartupBanner>
   16.90        <CompileAs>Default</CompileAs>
   16.91 @@ -75,14 +102,46 @@
   16.92        <Culture>0x0409</Culture>
   16.93      </ResourceCompile>
   16.94      <Link>
   16.95 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
   16.96 -      <OutputFile>.\Release/testoverlay.exe</OutputFile>
   16.97        <SuppressStartupBanner>true</SuppressStartupBanner>
   16.98 -      <ProgramDatabaseFile>.\Release/testoverlay.pdb</ProgramDatabaseFile>
   16.99        <SubSystem>Windows</SubSystem>
  16.100      </Link>
  16.101      <PostBuildEvent>
  16.102 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll
  16.103 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
  16.104 +copy $(SolutionDir)\..\test\sample.bmp $(ProjectDir)\sample.bmp</Command>
  16.105 +    </PostBuildEvent>
  16.106 +    <PostBuildEvent>
  16.107 +      <Message>Copy SDL and data files</Message>
  16.108 +    </PostBuildEvent>
  16.109 +  </ItemDefinitionGroup>
  16.110 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  16.111 +    <Midl>
  16.112 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  16.113 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  16.114 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  16.115 +    </Midl>
  16.116 +    <ClCompile>
  16.117 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
  16.118 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  16.119 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  16.120 +      <StringPooling>true</StringPooling>
  16.121 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  16.122 +      <FunctionLevelLinking>true</FunctionLevelLinking>
  16.123 +      <PrecompiledHeader>
  16.124 +      </PrecompiledHeader>
  16.125 +      <WarningLevel>Level3</WarningLevel>
  16.126 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  16.127 +      <CompileAs>Default</CompileAs>
  16.128 +    </ClCompile>
  16.129 +    <ResourceCompile>
  16.130 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  16.131 +      <Culture>0x0409</Culture>
  16.132 +    </ResourceCompile>
  16.133 +    <Link>
  16.134 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  16.135 +      <SubSystem>Windows</SubSystem>
  16.136 +    </Link>
  16.137 +    <PostBuildEvent>
  16.138 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
  16.139  copy $(SolutionDir)\..\test\sample.bmp $(ProjectDir)\sample.bmp</Command>
  16.140      </PostBuildEvent>
  16.141      <PostBuildEvent>
  16.142 @@ -95,7 +154,6 @@
  16.143        <MkTypLibCompatible>true</MkTypLibCompatible>
  16.144        <SuppressStartupBanner>true</SuppressStartupBanner>
  16.145        <TargetEnvironment>Win32</TargetEnvironment>
  16.146 -      <TypeLibraryName>.\Debug/testoverlay.tlb</TypeLibraryName>
  16.147      </Midl>
  16.148      <ClCompile>
  16.149        <Optimization>Disabled</Optimization>
  16.150 @@ -104,10 +162,6 @@
  16.151        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  16.152        <PrecompiledHeader>
  16.153        </PrecompiledHeader>
  16.154 -      <PrecompiledHeaderOutputFile>.\Debug/testoverlay.pch</PrecompiledHeaderOutputFile>
  16.155 -      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
  16.156 -      <ObjectFileName>.\Debug/</ObjectFileName>
  16.157 -      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
  16.158        <WarningLevel>Level3</WarningLevel>
  16.159        <SuppressStartupBanner>true</SuppressStartupBanner>
  16.160        <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
  16.161 @@ -118,15 +172,47 @@
  16.162        <Culture>0x0409</Culture>
  16.163      </ResourceCompile>
  16.164      <Link>
  16.165 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  16.166 -      <OutputFile>.\Debug/testoverlay.exe</OutputFile>
  16.167        <SuppressStartupBanner>true</SuppressStartupBanner>
  16.168        <GenerateDebugInformation>true</GenerateDebugInformation>
  16.169 -      <ProgramDatabaseFile>.\Debug/testoverlay.pdb</ProgramDatabaseFile>
  16.170        <SubSystem>Windows</SubSystem>
  16.171      </Link>
  16.172      <PostBuildEvent>
  16.173 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll
  16.174 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
  16.175 +copy $(SolutionDir)\..\test\sample.bmp $(ProjectDir)\sample.bmp</Command>
  16.176 +    </PostBuildEvent>
  16.177 +    <PostBuildEvent>
  16.178 +      <Message>Copy SDL and data files</Message>
  16.179 +    </PostBuildEvent>
  16.180 +  </ItemDefinitionGroup>
  16.181 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
  16.182 +    <Midl>
  16.183 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  16.184 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  16.185 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  16.186 +    </Midl>
  16.187 +    <ClCompile>
  16.188 +      <Optimization>Disabled</Optimization>
  16.189 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  16.190 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  16.191 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  16.192 +      <PrecompiledHeader>
  16.193 +      </PrecompiledHeader>
  16.194 +      <WarningLevel>Level3</WarningLevel>
  16.195 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  16.196 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
  16.197 +      <CompileAs>Default</CompileAs>
  16.198 +    </ClCompile>
  16.199 +    <ResourceCompile>
  16.200 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  16.201 +      <Culture>0x0409</Culture>
  16.202 +    </ResourceCompile>
  16.203 +    <Link>
  16.204 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  16.205 +      <GenerateDebugInformation>true</GenerateDebugInformation>
  16.206 +      <SubSystem>Windows</SubSystem>
  16.207 +    </Link>
  16.208 +    <PostBuildEvent>
  16.209 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
  16.210  copy $(SolutionDir)\..\test\sample.bmp $(ProjectDir)\sample.bmp</Command>
  16.211      </PostBuildEvent>
  16.212      <PostBuildEvent>
  16.213 @@ -134,8 +220,8 @@
  16.214      </PostBuildEvent>
  16.215    </ItemDefinitionGroup>
  16.216    <ItemGroup>
  16.217 -    <Library Include="..\..\Sdl\Debug\SDL.lib" />
  16.218 -    <Library Include="..\..\SDLmain\Debug\SDLmain.lib" />
  16.219 +    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
  16.220 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
  16.221    </ItemGroup>
  16.222    <ItemGroup>
  16.223      <ClCompile Include="..\..\..\test\testoverlay.c" />
    17.1 --- a/VisualC/tests/testoverlay2/testoverlay2_VS2010.vcxproj	Tue Apr 19 08:08:50 2011 -0700
    17.2 +++ b/VisualC/tests/testoverlay2/testoverlay2_VS2010.vcxproj	Tue Apr 19 09:53:01 2011 -0700
    17.3 @@ -5,10 +5,18 @@
    17.4        <Configuration>Debug</Configuration>
    17.5        <Platform>Win32</Platform>
    17.6      </ProjectConfiguration>
    17.7 +    <ProjectConfiguration Include="Debug|x64">
    17.8 +      <Configuration>Debug</Configuration>
    17.9 +      <Platform>x64</Platform>
   17.10 +    </ProjectConfiguration>
   17.11      <ProjectConfiguration Include="Release|Win32">
   17.12        <Configuration>Release</Configuration>
   17.13        <Platform>Win32</Platform>
   17.14      </ProjectConfiguration>
   17.15 +    <ProjectConfiguration Include="Release|x64">
   17.16 +      <Configuration>Release</Configuration>
   17.17 +      <Platform>x64</Platform>
   17.18 +    </ProjectConfiguration>
   17.19    </ItemGroup>
   17.20    <PropertyGroup Label="Globals">
   17.21      <ProjectName>testoverlay2</ProjectName>
   17.22 @@ -20,10 +28,19 @@
   17.23      <ConfigurationType>Application</ConfigurationType>
   17.24      <UseOfMfc>false</UseOfMfc>
   17.25    </PropertyGroup>
   17.26 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
   17.27 +    <ConfigurationType>Application</ConfigurationType>
   17.28 +    <UseOfMfc>false</UseOfMfc>
   17.29 +    <CharacterSet>MultiByte</CharacterSet>
   17.30 +  </PropertyGroup>
   17.31    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
   17.32      <ConfigurationType>Application</ConfigurationType>
   17.33      <UseOfMfc>false</UseOfMfc>
   17.34    </PropertyGroup>
   17.35 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
   17.36 +    <ConfigurationType>Application</ConfigurationType>
   17.37 +    <UseOfMfc>false</UseOfMfc>
   17.38 +  </PropertyGroup>
   17.39    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   17.40    <ImportGroup Label="ExtensionSettings">
   17.41    </ImportGroup>
   17.42 @@ -31,19 +48,33 @@
   17.43      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   17.44      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   17.45    </ImportGroup>
   17.46 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
   17.47 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   17.48 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   17.49 +  </ImportGroup>
   17.50    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
   17.51      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   17.52      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   17.53    </ImportGroup>
   17.54 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
   17.55 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   17.56 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   17.57 +  </ImportGroup>
   17.58    <PropertyGroup Label="UserMacros" />
   17.59    <PropertyGroup>
   17.60      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   17.61 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
   17.62 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
   17.63 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
   17.64 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
   17.65 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
   17.66 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
   17.67      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
   17.68 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
   17.69 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
   17.70 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   17.71 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
   17.72 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
   17.73 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
   17.74 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
   17.75      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
   17.76 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   17.77    </PropertyGroup>
   17.78    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   17.79      <Midl>
   17.80 @@ -51,7 +82,6 @@
   17.81        <MkTypLibCompatible>true</MkTypLibCompatible>
   17.82        <SuppressStartupBanner>true</SuppressStartupBanner>
   17.83        <TargetEnvironment>Win32</TargetEnvironment>
   17.84 -      <TypeLibraryName>.\Release/testoverlay2.tlb</TypeLibraryName>
   17.85      </Midl>
   17.86      <ClCompile>
   17.87        <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
   17.88 @@ -62,10 +92,6 @@
   17.89        <FunctionLevelLinking>true</FunctionLevelLinking>
   17.90        <PrecompiledHeader>
   17.91        </PrecompiledHeader>
   17.92 -      <PrecompiledHeaderOutputFile>.\Release/testoverlay2.pch</PrecompiledHeaderOutputFile>
   17.93 -      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
   17.94 -      <ObjectFileName>.\Release/</ObjectFileName>
   17.95 -      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
   17.96        <WarningLevel>Level3</WarningLevel>
   17.97        <SuppressStartupBanner>true</SuppressStartupBanner>
   17.98        <CompileAs>Default</CompileAs>
   17.99 @@ -75,14 +101,46 @@
  17.100        <Culture>0x0409</Culture>
  17.101      </ResourceCompile>
  17.102      <Link>
  17.103 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  17.104 -      <OutputFile>.\Release/testoverlay2.exe</OutputFile>
  17.105        <SuppressStartupBanner>true</SuppressStartupBanner>
  17.106 -      <ProgramDatabaseFile>.\Release/testoverlay2.pdb</ProgramDatabaseFile>
  17.107        <SubSystem>Windows</SubSystem>
  17.108      </Link>
  17.109      <PostBuildEvent>
  17.110 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll
  17.111 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
  17.112 +copy $(SolutionDir)\..\test\moose.dat $(ProjectDir)\moose.dat</Command>
  17.113 +    </PostBuildEvent>
  17.114 +    <PostBuildEvent>
  17.115 +      <Message>Copy SDL and data files</Message>
  17.116 +    </PostBuildEvent>
  17.117 +  </ItemDefinitionGroup>
  17.118 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  17.119 +    <Midl>
  17.120 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  17.121 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  17.122 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  17.123 +    </Midl>
  17.124 +    <ClCompile>
  17.125 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
  17.126 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  17.127 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  17.128 +      <StringPooling>true</StringPooling>
  17.129 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  17.130 +      <FunctionLevelLinking>true</FunctionLevelLinking>
  17.131 +      <PrecompiledHeader>
  17.132 +      </PrecompiledHeader>
  17.133 +      <WarningLevel>Level3</WarningLevel>
  17.134 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  17.135 +      <CompileAs>Default</CompileAs>
  17.136 +    </ClCompile>
  17.137 +    <ResourceCompile>
  17.138 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  17.139 +      <Culture>0x0409</Culture>
  17.140 +    </ResourceCompile>
  17.141 +    <Link>
  17.142 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  17.143 +      <SubSystem>Windows</SubSystem>
  17.144 +    </Link>
  17.145 +    <PostBuildEvent>
  17.146 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
  17.147  copy $(SolutionDir)\..\test\moose.dat $(ProjectDir)\moose.dat</Command>
  17.148      </PostBuildEvent>
  17.149      <PostBuildEvent>
  17.150 @@ -95,7 +153,6 @@
  17.151        <MkTypLibCompatible>true</MkTypLibCompatible>
  17.152        <SuppressStartupBanner>true</SuppressStartupBanner>
  17.153        <TargetEnvironment>Win32</TargetEnvironment>
  17.154 -      <TypeLibraryName>.\Debug/testoverlay2.tlb</TypeLibraryName>
  17.155      </Midl>
  17.156      <ClCompile>
  17.157        <Optimization>Disabled</Optimization>
  17.158 @@ -104,10 +161,6 @@
  17.159        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  17.160        <PrecompiledHeader>
  17.161        </PrecompiledHeader>
  17.162 -      <PrecompiledHeaderOutputFile>.\Debug/testoverlay2.pch</PrecompiledHeaderOutputFile>
  17.163 -      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
  17.164 -      <ObjectFileName>.\Debug/</ObjectFileName>
  17.165 -      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
  17.166        <WarningLevel>Level3</WarningLevel>
  17.167        <SuppressStartupBanner>true</SuppressStartupBanner>
  17.168        <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
  17.169 @@ -118,24 +171,57 @@
  17.170        <Culture>0x0409</Culture>
  17.171      </ResourceCompile>
  17.172      <Link>
  17.173 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  17.174 -      <OutputFile>.\Debug/testoverlay2.exe</OutputFile>
  17.175        <SuppressStartupBanner>true</SuppressStartupBanner>
  17.176        <GenerateDebugInformation>true</GenerateDebugInformation>
  17.177 -      <ProgramDatabaseFile>.\Debug/testoverlay2.pdb</ProgramDatabaseFile>
  17.178        <SubSystem>Windows</SubSystem>
  17.179      </Link>
  17.180      <PostBuildEvent>
  17.181 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll
  17.182 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
  17.183  copy $(SolutionDir)\..\test\moose.dat $(ProjectDir)\moose.dat</Command>
  17.184      </PostBuildEvent>
  17.185      <PostBuildEvent>
  17.186        <Message>Copy SDL and data files</Message>
  17.187      </PostBuildEvent>
  17.188    </ItemDefinitionGroup>
  17.189 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
  17.190 +    <Midl>
  17.191 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  17.192 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  17.193 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  17.194 +    </Midl>
  17.195 +    <ClCompile>
  17.196 +      <Optimization>Disabled</Optimization>
  17.197 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  17.198 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  17.199 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  17.200 +      <PrecompiledHeader>
  17.201 +      </PrecompiledHeader>
  17.202 +      <WarningLevel>Level3</WarningLevel>
  17.203 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  17.204 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
  17.205 +      <CompileAs>Default</CompileAs>
  17.206 +    </ClCompile>
  17.207 +    <ResourceCompile>
  17.208 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  17.209 +      <Culture>0x0409</Culture>
  17.210 +    </ResourceCompile>
  17.211 +    <Link>
  17.212 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  17.213 +      <GenerateDebugInformation>true</GenerateDebugInformation>
  17.214 +      <SubSystem>Windows</SubSystem>
  17.215 +    </Link>
  17.216 +    <PostBuildEvent>
  17.217 +      <Command>
  17.218 +        copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
  17.219 +        copy $(SolutionDir)\..\test\moose.dat $(ProjectDir)\moose.dat</Command>
  17.220 +    </PostBuildEvent>
  17.221 +    <PostBuildEvent>
  17.222 +      <Message>Copy SDL and data files</Message>
  17.223 +    </PostBuildEvent>
  17.224 +  </ItemDefinitionGroup>
  17.225    <ItemGroup>
  17.226 -    <Library Include="..\..\Sdl\Debug\SDL.lib" />
  17.227 -    <Library Include="..\..\SDLmain\Debug\SDLmain.lib" />
  17.228 +    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
  17.229 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
  17.230    </ItemGroup>
  17.231    <ItemGroup>
  17.232      <ClCompile Include="..\..\..\test\testoverlay2.c" />
    18.1 --- a/VisualC/tests/testplatform/testplatform_VS2010.vcxproj	Tue Apr 19 08:08:50 2011 -0700
    18.2 +++ b/VisualC/tests/testplatform/testplatform_VS2010.vcxproj	Tue Apr 19 09:53:01 2011 -0700
    18.3 @@ -5,10 +5,18 @@
    18.4        <Configuration>Debug</Configuration>
    18.5        <Platform>Win32</Platform>
    18.6      </ProjectConfiguration>
    18.7 +    <ProjectConfiguration Include="Debug|x64">
    18.8 +      <Configuration>Debug</Configuration>
    18.9 +      <Platform>x64</Platform>
   18.10 +    </ProjectConfiguration>
   18.11      <ProjectConfiguration Include="Release|Win32">
   18.12        <Configuration>Release</Configuration>
   18.13        <Platform>Win32</Platform>
   18.14      </ProjectConfiguration>
   18.15 +    <ProjectConfiguration Include="Release|x64">
   18.16 +      <Configuration>Release</Configuration>
   18.17 +      <Platform>x64</Platform>
   18.18 +    </ProjectConfiguration>
   18.19    </ItemGroup>
   18.20    <PropertyGroup Label="Globals">
   18.21      <ProjectName>testplatform</ProjectName>
   18.22 @@ -20,10 +28,19 @@
   18.23      <ConfigurationType>Application</ConfigurationType>
   18.24      <UseOfMfc>false</UseOfMfc>
   18.25    </PropertyGroup>
   18.26 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
   18.27 +    <ConfigurationType>Application</ConfigurationType>
   18.28 +    <UseOfMfc>false</UseOfMfc>
   18.29 +  </PropertyGroup>
   18.30    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
   18.31      <ConfigurationType>Application</ConfigurationType>
   18.32      <UseOfMfc>false</UseOfMfc>
   18.33    </PropertyGroup>
   18.34 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
   18.35 +    <ConfigurationType>Application</ConfigurationType>
   18.36 +    <UseOfMfc>false</UseOfMfc>
   18.37 +    <CharacterSet>MultiByte</CharacterSet>
   18.38 +  </PropertyGroup>
   18.39    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   18.40    <ImportGroup Label="ExtensionSettings">
   18.41    </ImportGroup>
   18.42 @@ -31,19 +48,33 @@
   18.43      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   18.44      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
   18.45    </ImportGroup>
   18.46 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
   18.47 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   18.48 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
   18.49 +  </ImportGroup>
   18.50    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
   18.51      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   18.52      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
   18.53    </ImportGroup>
   18.54 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
   18.55 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   18.56 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
   18.57 +  </ImportGroup>
   18.58    <PropertyGroup Label="UserMacros" />
   18.59    <PropertyGroup>
   18.60      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   18.61 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
   18.62 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
   18.63 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
   18.64 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
   18.65 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
   18.66 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
   18.67      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
   18.68 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
   18.69 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
   18.70 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   18.71 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
   18.72 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
   18.73 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
   18.74 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
   18.75      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
   18.76 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   18.77    </PropertyGroup>
   18.78    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   18.79      <Midl>
   18.80 @@ -51,9 +82,6 @@
   18.81        <MkTypLibCompatible>true</MkTypLibCompatible>
   18.82        <SuppressStartupBanner>true</SuppressStartupBanner>
   18.83        <TargetEnvironment>Win32</TargetEnvironment>
   18.84 -      <TypeLibraryName>.\Debug/testplatform.tlb</TypeLibraryName>
   18.85 -      <HeaderFileName>
   18.86 -      </HeaderFileName>
   18.87      </Midl>
   18.88      <ClCompile>
   18.89        <Optimization>Disabled</Optimization>
   18.90 @@ -61,10 +89,6 @@
   18.91        <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   18.92        <MinimalRebuild>true</MinimalRebuild>
   18.93        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   18.94 -      <PrecompiledHeaderOutputFile>.\Debug/testplatform.pch</PrecompiledHeaderOutputFile>
   18.95 -      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
   18.96 -      <ObjectFileName>.\Debug/</ObjectFileName>
   18.97 -      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
   18.98        <WarningLevel>Level3</WarningLevel>
   18.99        <SuppressStartupBanner>true</SuppressStartupBanner>
  18.100        <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
  18.101 @@ -74,19 +98,49 @@
  18.102        <Culture>0x0409</Culture>
  18.103      </ResourceCompile>
  18.104      <Link>
  18.105 -      <OutputFile>.\Debug/testplatform.exe</OutputFile>
  18.106        <SuppressStartupBanner>true</SuppressStartupBanner>
  18.107        <GenerateDebugInformation>true</GenerateDebugInformation>
  18.108 -      <ProgramDatabaseFile>.\Debug/testplatform.pdb</ProgramDatabaseFile>
  18.109        <SubSystem>Windows</SubSystem>
  18.110 -      <TargetMachine>MachineX86</TargetMachine>
  18.111      </Link>
  18.112      <Bscmake>
  18.113        <SuppressStartupBanner>true</SuppressStartupBanner>
  18.114 -      <OutputFile>.\Debug/testplatform.bsc</OutputFile>
  18.115      </Bscmake>
  18.116      <PostBuildEvent>
  18.117 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll</Command>
  18.118 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  18.119 +    </PostBuildEvent>
  18.120 +    <PostBuildEvent>
  18.121 +      <Message>Copy SDL</Message>
  18.122 +    </PostBuildEvent>
  18.123 +  </ItemDefinitionGroup>
  18.124 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
  18.125 +    <Midl>
  18.126 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  18.127 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  18.128 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  18.129 +    </Midl>
  18.130 +    <ClCompile>
  18.131 +      <Optimization>Disabled</Optimization>
  18.132 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  18.133 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  18.134 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  18.135 +      <WarningLevel>Level3</WarningLevel>
  18.136 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  18.137 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
  18.138 +    </ClCompile>
  18.139 +    <ResourceCompile>
  18.140 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  18.141 +      <Culture>0x0409</Culture>
  18.142 +    </ResourceCompile>
  18.143 +    <Link>
  18.144 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  18.145 +      <GenerateDebugInformation>true</GenerateDebugInformation>
  18.146 +      <SubSystem>Windows</SubSystem>
  18.147 +    </Link>
  18.148 +    <Bscmake>
  18.149 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  18.150 +    </Bscmake>
  18.151 +    <PostBuildEvent>
  18.152 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  18.153      </PostBuildEvent>
  18.154      <PostBuildEvent>
  18.155        <Message>Copy SDL</Message>
  18.156 @@ -111,9 +165,9 @@
  18.157        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  18.158        <FunctionLevelLinking>true</FunctionLevelLinking>
  18.159        <PrecompiledHeaderOutputFile>.\Release/testplatform.pch</PrecompiledHeaderOutputFile>
  18.160 -      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
  18.161 -      <ObjectFileName>.\Release/</ObjectFileName>
  18.162 -      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
  18.163 +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
  18.164 +      <ObjectFileName>$(IntDir)</ObjectFileName>
  18.165 +      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
  18.166        <WarningLevel>Level3</WarningLevel>
  18.167        <SuppressStartupBanner>true</SuppressStartupBanner>
  18.168      </ClCompile>
  18.169 @@ -122,33 +176,68 @@
  18.170        <Culture>0x0409</Culture>
  18.171      </ResourceCompile>
  18.172      <Link>
  18.173 -      <OutputFile>.\Release/testplatform.exe</OutputFile>
  18.174        <SuppressStartupBanner>true</SuppressStartupBanner>
  18.175 -      <ProgramDatabaseFile>.\Release/testplatform.pdb</ProgramDatabaseFile>
  18.176        <SubSystem>Windows</SubSystem>
  18.177 -      <TargetMachine>MachineX86</TargetMachine>
  18.178      </Link>
  18.179      <Bscmake>
  18.180        <SuppressStartupBanner>true</SuppressStartupBanner>
  18.181 -      <OutputFile>.\Release/testplatform.bsc</OutputFile>
  18.182      </Bscmake>
  18.183      <PostBuildEvent>
  18.184 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll</Command>
  18.185 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  18.186 +    </PostBuildEvent>
  18.187 +    <PostBuildEvent>
  18.188 +      <Message>Copy SDL</Message>
  18.189 +    </PostBuildEvent>
  18.190 +  </ItemDefinitionGroup>
  18.191 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  18.192 +    <Midl>
  18.193 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  18.194 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  18.195 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  18.196 +    </Midl>
  18.197 +    <ClCompile>
  18.198 +      <Optimization>MaxSpeed</Optimization>
  18.199 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
  18.200 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  18.201 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  18.202 +      <StringPooling>true</StringPooling>
  18.203 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  18.204 +      <FunctionLevelLinking>true</FunctionLevelLinking>
  18.205 +      <WarningLevel>Level3</WarningLevel>
  18.206 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  18.207 +    </ClCompile>
  18.208 +    <ResourceCompile>
  18.209 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  18.210 +      <Culture>0x0409</Culture>
  18.211 +    </ResourceCompile>
  18.212 +    <Link>
  18.213 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  18.214 +      <SubSystem>Windows</SubSystem>
  18.215 +    </Link>
  18.216 +    <Bscmake>
  18.217 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  18.218 +    </Bscmake>
  18.219 +    <PostBuildEvent>
  18.220 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  18.221      </PostBuildEvent>
  18.222      <PostBuildEvent>
  18.223        <Message>Copy SDL</Message>
  18.224      </PostBuildEvent>
  18.225    </ItemDefinitionGroup>
  18.226    <ItemGroup>
  18.227 -    <Library Include="..\..\Sdl\Debug\SDL.lib" />
  18.228 -    <Library Include="..\..\SDLmain\Debug\SDLmain.lib" />
  18.229 +    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
  18.230 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
  18.231    </ItemGroup>
  18.232    <ItemGroup>
  18.233      <ClCompile Include="..\..\..\Test\testplatform.c">
  18.234        <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  18.235 +      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  18.236        <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
  18.237 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
  18.238        <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  18.239 +      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  18.240        <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
  18.241 +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
  18.242      </ClCompile>
  18.243    </ItemGroup>
  18.244    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    19.1 --- a/VisualC/tests/testpower/testpower_VS2010.vcxproj	Tue Apr 19 08:08:50 2011 -0700
    19.2 +++ b/VisualC/tests/testpower/testpower_VS2010.vcxproj	Tue Apr 19 09:53:01 2011 -0700
    19.3 @@ -5,10 +5,18 @@
    19.4        <Configuration>Debug</Configuration>
    19.5        <Platform>Win32</Platform>
    19.6      </ProjectConfiguration>
    19.7 +    <ProjectConfiguration Include="Debug|x64">
    19.8 +      <Configuration>Debug</Configuration>
    19.9 +      <Platform>x64</Platform>
   19.10 +    </ProjectConfiguration>
   19.11      <ProjectConfiguration Include="Release|Win32">
   19.12        <Configuration>Release</Configuration>
   19.13        <Platform>Win32</Platform>
   19.14      </ProjectConfiguration>
   19.15 +    <ProjectConfiguration Include="Release|x64">
   19.16 +      <Configuration>Release</Configuration>
   19.17 +      <Platform>x64</Platform>
   19.18 +    </ProjectConfiguration>
   19.19    </ItemGroup>
   19.20    <PropertyGroup Label="Globals">
   19.21      <ProjectName>testpower</ProjectName>
   19.22 @@ -20,10 +28,19 @@
   19.23      <ConfigurationType>Application</ConfigurationType>
   19.24      <UseOfMfc>false</UseOfMfc>
   19.25    </PropertyGroup>
   19.26 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
   19.27 +    <ConfigurationType>Application</ConfigurationType>
   19.28 +    <UseOfMfc>false</UseOfMfc>
   19.29 +  </PropertyGroup>
   19.30    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
   19.31      <ConfigurationType>Application</ConfigurationType>
   19.32      <UseOfMfc>false</UseOfMfc>
   19.33    </PropertyGroup>
   19.34 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
   19.35 +    <ConfigurationType>Application</ConfigurationType>
   19.36 +    <UseOfMfc>false</UseOfMfc>
   19.37 +    <CharacterSet>MultiByte</CharacterSet>
   19.38 +  </PropertyGroup>
   19.39    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   19.40    <ImportGroup Label="ExtensionSettings">
   19.41    </ImportGroup>
   19.42 @@ -31,19 +48,33 @@
   19.43      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   19.44      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   19.45    </ImportGroup>
   19.46 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
   19.47 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   19.48 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   19.49 +  </ImportGroup>
   19.50    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
   19.51      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   19.52      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   19.53    </ImportGroup>
   19.54 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
   19.55 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   19.56 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   19.57 +  </ImportGroup>
   19.58    <PropertyGroup Label="UserMacros" />
   19.59    <PropertyGroup>
   19.60      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   19.61 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
   19.62 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
   19.63 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
   19.64 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
   19.65 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
   19.66 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
   19.67      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
   19.68 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
   19.69 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
   19.70 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   19.71 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
   19.72 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
   19.73 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
   19.74 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
   19.75      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
   19.76 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   19.77    </PropertyGroup>
   19.78    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   19.79      <Midl>
   19.80 @@ -51,7 +82,6 @@
   19.81        <MkTypLibCompatible>true</MkTypLibCompatible>
   19.82        <SuppressStartupBanner>true</SuppressStartupBanner>
   19.83        <TargetEnvironment>Win32</TargetEnvironment>
   19.84 -      <TypeLibraryName>.\Debug/testpower.tlb</TypeLibraryName>
   19.85      </Midl>
   19.86      <ClCompile>
   19.87        <Optimization>Disabled</Optimization>
   19.88 @@ -60,10 +90,6 @@
   19.89        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   19.90        <PrecompiledHeader>
   19.91        </PrecompiledHeader>
   19.92 -      <PrecompiledHeaderOutputFile>.\Debug/testpower.pch</PrecompiledHeaderOutputFile>
   19.93 -      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
   19.94 -      <ObjectFileName>.\Debug/</ObjectFileName>
   19.95 -      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
   19.96        <WarningLevel>Level3</WarningLevel>
   19.97        <SuppressStartupBanner>true</SuppressStartupBanner>
   19.98        <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
   19.99 @@ -74,15 +100,46 @@
  19.100        <Culture>0x0409</Culture>
  19.101      </ResourceCompile>
  19.102      <Link>
  19.103 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  19.104 -      <OutputFile>.\Debug/testpower.exe</OutputFile>
  19.105        <SuppressStartupBanner>true</SuppressStartupBanner>
  19.106        <GenerateDebugInformation>true</GenerateDebugInformation>
  19.107 -      <ProgramDatabaseFile>.\Debug/testpower.pdb</ProgramDatabaseFile>
  19.108        <SubSystem>Windows</SubSystem>
  19.109      </Link>
  19.110      <PostBuildEvent>
  19.111 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll</Command>
  19.112 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  19.113 +    </PostBuildEvent>
  19.114 +    <PostBuildEvent>
  19.115 +      <Message>Copy SDL</Message>
  19.116 +    </PostBuildEvent>
  19.117 +  </ItemDefinitionGroup>
  19.118 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
  19.119 +    <Midl>
  19.120 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  19.121 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  19.122 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  19.123 +    </Midl>
  19.124 +    <ClCompile>
  19.125 +      <Optimization>Disabled</Optimization>
  19.126 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  19.127 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  19.128 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  19.129 +      <PrecompiledHeader>
  19.130 +      </PrecompiledHeader>
  19.131 +      <WarningLevel>Level3</WarningLevel>
  19.132 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  19.133 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
  19.134 +      <CompileAs>Default</CompileAs>
  19.135 +    </ClCompile>
  19.136 +    <ResourceCompile>
  19.137 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  19.138 +      <Culture>0x0409</Culture>
  19.139 +    </ResourceCompile>
  19.140 +    <Link>
  19.141 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  19.142 +      <GenerateDebugInformation>true</GenerateDebugInformation>
  19.143 +      <SubSystem>Windows</SubSystem>
  19.144 +    </Link>
  19.145 +    <PostBuildEvent>
  19.146 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  19.147      </PostBuildEvent>
  19.148      <PostBuildEvent>
  19.149        <Message>Copy SDL</Message>
  19.150 @@ -94,7 +151,6 @@
  19.151        <MkTypLibCompatible>true</MkTypLibCompatible>
  19.152        <SuppressStartupBanner>true</SuppressStartupBanner>
  19.153        <TargetEnvironment>Win32</TargetEnvironment>
  19.154 -      <TypeLibraryName>.\Release/testpower.tlb</TypeLibraryName>
  19.155      </Midl>
  19.156      <ClCompile>
  19.157        <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
  19.158 @@ -105,10 +161,6 @@
  19.159        <FunctionLevelLinking>true</FunctionLevelLinking>
  19.160        <PrecompiledHeader>
  19.161        </PrecompiledHeader>
  19.162 -      <PrecompiledHeaderOutputFile>.\Release/testpower.pch</PrecompiledHeaderOutputFile>
  19.163 -      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
  19.164 -      <ObjectFileName>.\Release/</ObjectFileName>
  19.165 -      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
  19.166        <WarningLevel>Level3</WarningLevel>
  19.167        <SuppressStartupBanner>true</SuppressStartupBanner>
  19.168        <CompileAs>Default</CompileAs>
  19.169 @@ -118,26 +170,58 @@
  19.170        <Culture>0x0409</Culture>
  19.171      </ResourceCompile>
  19.172      <Link>
  19.173 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  19.174 -      <OutputFile>.\Release/testpower.exe</OutputFile>
  19.175        <SuppressStartupBanner>true</SuppressStartupBanner>
  19.176 -      <ProgramDatabaseFile>.\Release/testpower.pdb</ProgramDatabaseFile>
  19.177        <SubSystem>Windows</SubSystem>
  19.178      </Link>
  19.179      <PostBuildEvent>
  19.180 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll</Command>
  19.181 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  19.182 +    </PostBuildEvent>
  19.183 +    <PostBuildEvent>
  19.184 +      <Message>Copy SDL</Message>
  19.185 +    </PostBuildEvent>
  19.186 +  </ItemDefinitionGroup>
  19.187 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  19.188 +    <Midl>
  19.189 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  19.190 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  19.191 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  19.192 +    </Midl>
  19.193 +    <ClCompile>
  19.194 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
  19.195 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  19.196 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  19.197 +      <StringPooling>true</StringPooling>
  19.198 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  19.199 +      <FunctionLevelLinking>true</FunctionLevelLinking>
  19.200 +      <PrecompiledHeader>
  19.201 +      </PrecompiledHeader>
  19.202 +      <WarningLevel>Level3</WarningLevel>
  19.203 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  19.204 +      <CompileAs>Default</CompileAs>
  19.205 +    </ClCompile>
  19.206 +    <ResourceCompile>
  19.207 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  19.208 +      <Culture>0x0409</Culture>
  19.209 +    </ResourceCompile>
  19.210 +    <Link>
  19.211 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  19.212 +      <SubSystem>Windows</SubSystem>
  19.213 +    </Link>
  19.214 +    <PostBuildEvent>
  19.215 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  19.216      </PostBuildEvent>
  19.217      <PostBuildEvent>
  19.218        <Message>Copy SDL</Message>
  19.219      </PostBuildEvent>
  19.220    </ItemDefinitionGroup>
  19.221    <ItemGroup>
  19.222 -    <Library Include="..\..\Sdl\Debug\SDL.lib" />
  19.223 -    <Library Include="..\..\SDLmain\Debug\SDLmain.lib" />
  19.224 +    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
  19.225 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
  19.226    </ItemGroup>
  19.227    <ItemGroup>
  19.228      <ClCompile Include="..\..\..\test\testpower.c">
  19.229        <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug/testpower.pch</PrecompiledHeaderOutputFile>
  19.230 +      <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\Debug/testpower.pch</PrecompiledHeaderOutputFile>
  19.231      </ClCompile>
  19.232    </ItemGroup>
  19.233    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    20.1 --- a/VisualC/tests/testshape/testshape_VS2010.vcxproj	Tue Apr 19 08:08:50 2011 -0700
    20.2 +++ b/VisualC/tests/testshape/testshape_VS2010.vcxproj	Tue Apr 19 09:53:01 2011 -0700
    20.3 @@ -5,10 +5,18 @@
    20.4        <Configuration>Debug</Configuration>
    20.5        <Platform>Win32</Platform>
    20.6      </ProjectConfiguration>
    20.7 +    <ProjectConfiguration Include="Debug|x64">
    20.8 +      <Configuration>Debug</Configuration>
    20.9 +      <Platform>x64</Platform>
   20.10 +    </ProjectConfiguration>
   20.11      <ProjectConfiguration Include="Release|Win32">
   20.12        <Configuration>Release</Configuration>
   20.13        <Platform>Win32</Platform>
   20.14      </ProjectConfiguration>
   20.15 +    <ProjectConfiguration Include="Release|x64">
   20.16 +      <Configuration>Release</Configuration>
   20.17 +      <Platform>x64</Platform>
   20.18 +    </ProjectConfiguration>
   20.19    </ItemGroup>
   20.20    <PropertyGroup Label="Globals">
   20.21      <ProjectName>testshape</ProjectName>
   20.22 @@ -20,10 +28,19 @@
   20.23      <ConfigurationType>Application</ConfigurationType>
   20.24      <UseOfMfc>false</UseOfMfc>
   20.25    </PropertyGroup>
   20.26 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
   20.27 +    <ConfigurationType>Application</ConfigurationType>
   20.28 +    <UseOfMfc>false</UseOfMfc>
   20.29 +    <CharacterSet>MultiByte</CharacterSet>
   20.30 +  </PropertyGroup>
   20.31    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
   20.32      <ConfigurationType>Application</ConfigurationType>
   20.33      <UseOfMfc>false</UseOfMfc>
   20.34    </PropertyGroup>
   20.35 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
   20.36 +    <ConfigurationType>Application</ConfigurationType>
   20.37 +    <UseOfMfc>false</UseOfMfc>
   20.38 +  </PropertyGroup>
   20.39    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   20.40    <ImportGroup Label="ExtensionSettings">
   20.41    </ImportGroup>
   20.42 @@ -31,19 +48,33 @@
   20.43      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   20.44      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   20.45    </ImportGroup>
   20.46 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
   20.47 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   20.48 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   20.49 +  </ImportGroup>
   20.50    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
   20.51      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   20.52      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   20.53    </ImportGroup>
   20.54 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
   20.55 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   20.56 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   20.57 +  </ImportGroup>
   20.58    <PropertyGroup Label="UserMacros" />
   20.59    <PropertyGroup>
   20.60      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   20.61 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
   20.62 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
   20.63 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
   20.64 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
   20.65 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
   20.66 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
   20.67      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
   20.68 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
   20.69 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
   20.70 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   20.71 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
   20.72 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
   20.73 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
   20.74 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
   20.75      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
   20.76 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   20.77    </PropertyGroup>
   20.78    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   20.79      <Midl>
   20.80 @@ -51,7 +82,6 @@
   20.81        <MkTypLibCompatible>true</MkTypLibCompatible>
   20.82        <SuppressStartupBanner>true</SuppressStartupBanner>
   20.83        <TargetEnvironment>Win32</TargetEnvironment>
   20.84 -      <TypeLibraryName>.\Release/testshape.tlb</TypeLibraryName>
   20.85      </Midl>
   20.86      <ClCompile>
   20.87        <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
   20.88 @@ -62,10 +92,6 @@
   20.89        <FunctionLevelLinking>true</FunctionLevelLinking>
   20.90        <PrecompiledHeader>
   20.91        </PrecompiledHeader>
   20.92 -      <PrecompiledHeaderOutputFile>.\Release/testshape.pch</PrecompiledHeaderOutputFile>
   20.93 -      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
   20.94 -      <ObjectFileName>.\Release/</ObjectFileName>
   20.95 -      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
   20.96        <WarningLevel>Level3</WarningLevel>
   20.97        <SuppressStartupBanner>true</SuppressStartupBanner>
   20.98        <CompileAs>Default</CompileAs>
   20.99 @@ -75,14 +101,45 @@
  20.100        <Culture>0x0409</Culture>
  20.101      </ResourceCompile>
  20.102      <Link>
  20.103 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  20.104 -      <OutputFile>.\Release/testshape.exe</OutputFile>
  20.105        <SuppressStartupBanner>true</SuppressStartupBanner>
  20.106 -      <ProgramDatabaseFile>.\Release/testshape.pdb</ProgramDatabaseFile>
  20.107        <SubSystem>Windows</SubSystem>
  20.108      </Link>
  20.109      <PostBuildEvent>
  20.110 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll</Command>
  20.111 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  20.112 +    </PostBuildEvent>
  20.113 +    <PostBuildEvent>
  20.114 +      <Message>Copy SDL</Message>
  20.115 +    </PostBuildEvent>
  20.116 +  </ItemDefinitionGroup>
  20.117 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  20.118 +    <Midl>
  20.119 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  20.120 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  20.121 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  20.122 +    </Midl>
  20.123 +    <ClCompile>
  20.124 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
  20.125 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  20.126 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  20.127 +      <StringPooling>true</StringPooling>
  20.128 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  20.129 +      <FunctionLevelLinking>true</FunctionLevelLinking>
  20.130 +      <PrecompiledHeader>
  20.131 +      </PrecompiledHeader>
  20.132 +      <WarningLevel>Level3</WarningLevel>
  20.133 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  20.134 +      <CompileAs>Default</CompileAs>
  20.135 +    </ClCompile>
  20.136 +    <ResourceCompile>
  20.137 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  20.138 +      <Culture>0x0409</Culture>
  20.139 +    </ResourceCompile>
  20.140 +    <Link>
  20.141 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  20.142 +      <SubSystem>Windows</SubSystem>
  20.143 +    </Link>
  20.144 +    <PostBuildEvent>
  20.145 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  20.146      </PostBuildEvent>
  20.147      <PostBuildEvent>
  20.148        <Message>Copy SDL</Message>
  20.149 @@ -94,7 +151,6 @@
  20.150        <MkTypLibCompatible>true</MkTypLibCompatible>
  20.151        <SuppressStartupBanner>true</SuppressStartupBanner>
  20.152        <TargetEnvironment>Win32</TargetEnvironment>
  20.153 -      <TypeLibraryName>.\Debug/testshape.tlb</TypeLibraryName>
  20.154      </Midl>
  20.155      <ClCompile>
  20.156        <Optimization>Disabled</Optimization>
  20.157 @@ -103,10 +159,6 @@
  20.158        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  20.159        <PrecompiledHeader>
  20.160        </PrecompiledHeader>
  20.161 -      <PrecompiledHeaderOutputFile>.\Debug/testshape.pch</PrecompiledHeaderOutputFile>
  20.162 -      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
  20.163 -      <ObjectFileName>.\Debug/</ObjectFileName>
  20.164 -      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
  20.165        <WarningLevel>Level3</WarningLevel>
  20.166        <SuppressStartupBanner>true</SuppressStartupBanner>
  20.167        <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
  20.168 @@ -117,23 +169,54 @@
  20.169        <Culture>0x0409</Culture>
  20.170      </ResourceCompile>
  20.171      <Link>
  20.172 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  20.173 -      <OutputFile>.\Debug/testshape.exe</OutputFile>
  20.174        <SuppressStartupBanner>true</SuppressStartupBanner>
  20.175        <GenerateDebugInformation>true</GenerateDebugInformation>
  20.176 -      <ProgramDatabaseFile>.\Debug/testshape.pdb</ProgramDatabaseFile>
  20.177        <SubSystem>Windows</SubSystem>
  20.178      </Link>
  20.179      <PostBuildEvent>
  20.180 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll</Command>
  20.181 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  20.182 +    </PostBuildEvent>
  20.183 +    <PostBuildEvent>
  20.184 +      <Message>Copy SDL</Message>
  20.185 +    </PostBuildEvent>
  20.186 +  </ItemDefinitionGroup>
  20.187 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
  20.188 +    <Midl>
  20.189 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  20.190 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  20.191 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  20.192 +    </Midl>
  20.193 +    <ClCompile>
  20.194 +      <Optimization>Disabled</Optimization>
  20.195 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  20.196 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  20.197 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  20.198 +      <PrecompiledHeader>
  20.199 +      </PrecompiledHeader>
  20.200 +      <WarningLevel>Level3</WarningLevel>
  20.201 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  20.202 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
  20.203 +      <CompileAs>Default</CompileAs>
  20.204 +    </ClCompile>
  20.205 +    <ResourceCompile>
  20.206 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  20.207 +      <Culture>0x0409</Culture>
  20.208 +    </ResourceCompile>
  20.209 +    <Link>
  20.210 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  20.211 +      <GenerateDebugInformation>true</GenerateDebugInformation>
  20.212 +      <SubSystem>Windows</SubSystem>
  20.213 +    </Link>
  20.214 +    <PostBuildEvent>
  20.215 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  20.216      </PostBuildEvent>
  20.217      <PostBuildEvent>
  20.218        <Message>Copy SDL</Message>
  20.219      </PostBuildEvent>
  20.220    </ItemDefinitionGroup>
  20.221    <ItemGroup>
  20.222 -    <Library Include="..\..\Sdl\Debug\SDL.lib" />
  20.223 -    <Library Include="..\..\SDLmain\Debug\SDLmain.lib" />
  20.224 +    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
  20.225 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
  20.226    </ItemGroup>
  20.227    <ItemGroup>
  20.228      <ClCompile Include="..\..\..\test\testshape.c" />
    21.1 --- a/VisualC/tests/testsprite/testsprite_VS2010.vcxproj	Tue Apr 19 08:08:50 2011 -0700
    21.2 +++ b/VisualC/tests/testsprite/testsprite_VS2010.vcxproj	Tue Apr 19 09:53:01 2011 -0700
    21.3 @@ -5,10 +5,18 @@
    21.4        <Configuration>Debug</Configuration>
    21.5        <Platform>Win32</Platform>
    21.6      </ProjectConfiguration>
    21.7 +    <ProjectConfiguration Include="Debug|x64">
    21.8 +      <Configuration>Debug</Configuration>
    21.9 +      <Platform>x64</Platform>
   21.10 +    </ProjectConfiguration>
   21.11      <ProjectConfiguration Include="Release|Win32">
   21.12        <Configuration>Release</Configuration>
   21.13        <Platform>Win32</Platform>
   21.14      </ProjectConfiguration>
   21.15 +    <ProjectConfiguration Include="Release|x64">
   21.16 +      <Configuration>Release</Configuration>
   21.17 +      <Platform>x64</Platform>
   21.18 +    </ProjectConfiguration>
   21.19    </ItemGroup>
   21.20    <PropertyGroup Label="Globals">
   21.21      <ProjectName>testsprite</ProjectName>
   21.22 @@ -20,10 +28,19 @@
   21.23      <ConfigurationType>Application</ConfigurationType>
   21.24      <UseOfMfc>false</UseOfMfc>
   21.25    </PropertyGroup>
   21.26 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
   21.27 +    <ConfigurationType>Application</ConfigurationType>
   21.28 +    <UseOfMfc>false</UseOfMfc>
   21.29 +    <CharacterSet>MultiByte</CharacterSet>
   21.30 +  </PropertyGroup>
   21.31    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
   21.32      <ConfigurationType>Application</ConfigurationType>
   21.33      <UseOfMfc>false</UseOfMfc>
   21.34    </PropertyGroup>
   21.35 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
   21.36 +    <ConfigurationType>Application</ConfigurationType>
   21.37 +    <UseOfMfc>false</UseOfMfc>
   21.38 +  </PropertyGroup>
   21.39    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   21.40    <ImportGroup Label="ExtensionSettings">
   21.41    </ImportGroup>
   21.42 @@ -31,19 +48,33 @@
   21.43      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   21.44      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   21.45    </ImportGroup>
   21.46 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
   21.47 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   21.48 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   21.49 +  </ImportGroup>
   21.50    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
   21.51      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   21.52      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   21.53    </ImportGroup>
   21.54 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
   21.55 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   21.56 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   21.57 +  </ImportGroup>
   21.58    <PropertyGroup Label="UserMacros" />
   21.59    <PropertyGroup>
   21.60      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   21.61 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
   21.62 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
   21.63 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
   21.64 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
   21.65 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
   21.66 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
   21.67      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
   21.68 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
   21.69 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
   21.70 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   21.71 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
   21.72 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
   21.73 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
   21.74 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
   21.75      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
   21.76 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   21.77    </PropertyGroup>
   21.78    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   21.79      <Midl>
   21.80 @@ -51,7 +82,6 @@
   21.81        <MkTypLibCompatible>true</MkTypLibCompatible>
   21.82        <SuppressStartupBanner>true</SuppressStartupBanner>
   21.83        <TargetEnvironment>Win32</TargetEnvironment>
   21.84 -      <TypeLibraryName>.\Release/testsprite.tlb</TypeLibraryName>
   21.85      </Midl>
   21.86      <ClCompile>
   21.87        <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
   21.88 @@ -62,10 +92,6 @@
   21.89        <FunctionLevelLinking>true</FunctionLevelLinking>
   21.90        <PrecompiledHeader>
   21.91        </PrecompiledHeader>
   21.92 -      <PrecompiledHeaderOutputFile>.\Release/testsprite.pch</PrecompiledHeaderOutputFile>
   21.93 -      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
   21.94 -      <ObjectFileName>.\Release/</ObjectFileName>
   21.95 -      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
   21.96        <WarningLevel>Level3</WarningLevel>
   21.97        <SuppressStartupBanner>true</SuppressStartupBanner>
   21.98        <CompileAs>Default</CompileAs>
   21.99 @@ -75,14 +101,46 @@
  21.100        <Culture>0x0409</Culture>
  21.101      </ResourceCompile>
  21.102      <Link>
  21.103 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  21.104 -      <OutputFile>.\Release/testsprite.exe</OutputFile>
  21.105        <SuppressStartupBanner>true</SuppressStartupBanner>
  21.106 -      <ProgramDatabaseFile>.\Release/testsprite.pdb</ProgramDatabaseFile>
  21.107        <SubSystem>Windows</SubSystem>
  21.108      </Link>
  21.109      <PostBuildEvent>
  21.110 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll
  21.111 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
  21.112 +copy $(SolutionDir)\..\test\icon.bmp $(ProjectDir)\icon.bmp</Command>
  21.113 +    </PostBuildEvent>
  21.114 +    <PostBuildEvent>
  21.115 +      <Message>Copy SDL and data files</Message>
  21.116 +    </PostBuildEvent>
  21.117 +  </ItemDefinitionGroup>
  21.118 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  21.119 +    <Midl>
  21.120 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  21.121 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  21.122 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  21.123 +    </Midl>
  21.124 +    <ClCompile>
  21.125 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
  21.126 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  21.127 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  21.128 +      <StringPooling>true</StringPooling>
  21.129 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  21.130 +      <FunctionLevelLinking>true</FunctionLevelLinking>
  21.131 +      <PrecompiledHeader>
  21.132 +      </PrecompiledHeader>
  21.133 +      <WarningLevel>Level3</WarningLevel>
  21.134 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  21.135 +      <CompileAs>Default</CompileAs>
  21.136 +    </ClCompile>
  21.137 +    <ResourceCompile>
  21.138 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  21.139 +      <Culture>0x0409</Culture>
  21.140 +    </ResourceCompile>
  21.141 +    <Link>
  21.142 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  21.143 +      <SubSystem>Windows</SubSystem>
  21.144 +    </Link>
  21.145 +    <PostBuildEvent>
  21.146 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
  21.147  copy $(SolutionDir)\..\test\icon.bmp $(ProjectDir)\icon.bmp</Command>
  21.148      </PostBuildEvent>
  21.149      <PostBuildEvent>
  21.150 @@ -95,7 +153,6 @@
  21.151        <MkTypLibCompatible>true</MkTypLibCompatible>
  21.152        <SuppressStartupBanner>true</SuppressStartupBanner>
  21.153        <TargetEnvironment>Win32</TargetEnvironment>
  21.154 -      <TypeLibraryName>.\Debug/testsprite.tlb</TypeLibraryName>
  21.155      </Midl>
  21.156      <ClCompile>
  21.157        <Optimization>Disabled</Optimization>
  21.158 @@ -104,10 +161,6 @@
  21.159        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  21.160        <PrecompiledHeader>
  21.161        </PrecompiledHeader>
  21.162 -      <PrecompiledHeaderOutputFile>.\Debug/testsprite.pch</PrecompiledHeaderOutputFile>
  21.163 -      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
  21.164 -      <ObjectFileName>.\Debug/</ObjectFileName>
  21.165 -      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
  21.166        <WarningLevel>Level3</WarningLevel>
  21.167        <SuppressStartupBanner>true</SuppressStartupBanner>
  21.168        <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
  21.169 @@ -118,24 +171,57 @@
  21.170        <Culture>0x0409</Culture>
  21.171      </ResourceCompile>
  21.172      <Link>
  21.173 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  21.174 -      <OutputFile>.\Debug/testsprite.exe</OutputFile>
  21.175        <SuppressStartupBanner>true</SuppressStartupBanner>
  21.176        <GenerateDebugInformation>true</GenerateDebugInformation>
  21.177 -      <ProgramDatabaseFile>.\Debug/testsprite.pdb</ProgramDatabaseFile>
  21.178        <SubSystem>Windows</SubSystem>
  21.179      </Link>
  21.180      <PostBuildEvent>
  21.181 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll
  21.182 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
  21.183  copy $(SolutionDir)\..\test\icon.bmp $(ProjectDir)\icon.bmp</Command>
  21.184      </PostBuildEvent>
  21.185      <PostBuildEvent>
  21.186        <Message>Copy SDL and data files</Message>
  21.187      </PostBuildEvent>
  21.188    </ItemDefinitionGroup>
  21.189 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
  21.190 +    <Midl>
  21.191 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  21.192 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  21.193 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  21.194 +    </Midl>
  21.195 +    <ClCompile>
  21.196 +      <Optimization>Disabled</Optimization>
  21.197 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  21.198 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  21.199 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  21.200 +      <PrecompiledHeader>
  21.201 +      </PrecompiledHeader>
  21.202 +      <WarningLevel>Level3</WarningLevel>
  21.203 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  21.204 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
  21.205 +      <CompileAs>Default</CompileAs>
  21.206 +    </ClCompile>
  21.207 +    <ResourceCompile>
  21.208 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  21.209 +      <Culture>0x0409</Culture>
  21.210 +    </ResourceCompile>
  21.211 +    <Link>
  21.212 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  21.213 +      <GenerateDebugInformation>true</GenerateDebugInformation>
  21.214 +      <SubSystem>Windows</SubSystem>
  21.215 +    </Link>
  21.216 +    <PostBuildEvent>
  21.217 +      <Command>
  21.218 +        copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
  21.219 +        copy $(SolutionDir)\..\test\icon.bmp $(ProjectDir)\icon.bmp</Command>
  21.220 +    </PostBuildEvent>
  21.221 +    <PostBuildEvent>
  21.222 +      <Message>Copy SDL and data files</Message>
  21.223 +    </PostBuildEvent>
  21.224 +  </ItemDefinitionGroup>
  21.225    <ItemGroup>
  21.226 -    <Library Include="..\..\Sdl\Debug\SDL.lib" />
  21.227 -    <Library Include="..\..\SDLmain\Debug\SDLmain.lib" />
  21.228 +    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
  21.229 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
  21.230    </ItemGroup>
  21.231    <ItemGroup>
  21.232      <ClCompile Include="..\..\..\test\testsprite.c" />
    22.1 --- a/VisualC/tests/testsprite2/testsprite2_VS2010.vcxproj	Tue Apr 19 08:08:50 2011 -0700
    22.2 +++ b/VisualC/tests/testsprite2/testsprite2_VS2010.vcxproj	Tue Apr 19 09:53:01 2011 -0700
    22.3 @@ -5,10 +5,18 @@
    22.4        <Configuration>Debug</Configuration>
    22.5        <Platform>Win32</Platform>
    22.6      </ProjectConfiguration>
    22.7 +    <ProjectConfiguration Include="Debug|x64">
    22.8 +      <Configuration>Debug</Configuration>
    22.9 +      <Platform>x64</Platform>
   22.10 +    </ProjectConfiguration>
   22.11      <ProjectConfiguration Include="Release|Win32">
   22.12        <Configuration>Release</Configuration>
   22.13        <Platform>Win32</Platform>
   22.14      </ProjectConfiguration>
   22.15 +    <ProjectConfiguration Include="Release|x64">
   22.16 +      <Configuration>Release</Configuration>
   22.17 +      <Platform>x64</Platform>
   22.18 +    </ProjectConfiguration>
   22.19    </ItemGroup>
   22.20    <PropertyGroup Label="Globals">
   22.21      <ProjectName>testsprite2</ProjectName>
   22.22 @@ -20,10 +28,19 @@
   22.23      <ConfigurationType>Application</ConfigurationType>
   22.24      <UseOfMfc>false</UseOfMfc>
   22.25    </PropertyGroup>
   22.26 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
   22.27 +    <ConfigurationType>Application</ConfigurationType>
   22.28 +    <UseOfMfc>false</UseOfMfc>
   22.29 +    <CharacterSet>MultiByte</CharacterSet>
   22.30 +  </PropertyGroup>
   22.31    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
   22.32      <ConfigurationType>Application</ConfigurationType>
   22.33      <UseOfMfc>false</UseOfMfc>
   22.34    </PropertyGroup>
   22.35 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
   22.36 +    <ConfigurationType>Application</ConfigurationType>
   22.37 +    <UseOfMfc>false</UseOfMfc>
   22.38 +  </PropertyGroup>
   22.39    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   22.40    <ImportGroup Label="ExtensionSettings">
   22.41    </ImportGroup>
   22.42 @@ -31,19 +48,33 @@
   22.43      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   22.44      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   22.45    </ImportGroup>
   22.46 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
   22.47 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   22.48 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   22.49 +  </ImportGroup>
   22.50    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
   22.51      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   22.52      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   22.53    </ImportGroup>
   22.54 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
   22.55 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   22.56 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   22.57 +  </ImportGroup>
   22.58    <PropertyGroup Label="UserMacros" />
   22.59    <PropertyGroup>
   22.60      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   22.61 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
   22.62 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
   22.63 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
   22.64 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
   22.65 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
   22.66 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
   22.67      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
   22.68 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
   22.69 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
   22.70 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   22.71 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
   22.72 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
   22.73 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
   22.74 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
   22.75      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
   22.76 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   22.77    </PropertyGroup>
   22.78    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   22.79      <Midl>
   22.80 @@ -51,7 +82,6 @@
   22.81        <MkTypLibCompatible>true</MkTypLibCompatible>
   22.82        <SuppressStartupBanner>true</SuppressStartupBanner>
   22.83        <TargetEnvironment>Win32</TargetEnvironment>
   22.84 -      <TypeLibraryName>.\Release/testsprite2.tlb</TypeLibraryName>
   22.85      </Midl>
   22.86      <ClCompile>
   22.87        <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
   22.88 @@ -62,10 +92,6 @@
   22.89        <FunctionLevelLinking>true</FunctionLevelLinking>
   22.90        <PrecompiledHeader>
   22.91        </PrecompiledHeader>
   22.92 -      <PrecompiledHeaderOutputFile>.\Release/testsprite2.pch</PrecompiledHeaderOutputFile>
   22.93 -      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
   22.94 -      <ObjectFileName>.\Release/</ObjectFileName>
   22.95 -      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
   22.96        <WarningLevel>Level3</WarningLevel>
   22.97        <SuppressStartupBanner>true</SuppressStartupBanner>
   22.98        <CompileAs>Default</CompileAs>
   22.99 @@ -75,14 +101,46 @@
  22.100        <Culture>0x0409</Culture>
  22.101      </ResourceCompile>
  22.102      <Link>
  22.103 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  22.104 -      <OutputFile>.\Release/testsprite2.exe</OutputFile>
  22.105        <SuppressStartupBanner>true</SuppressStartupBanner>
  22.106 -      <ProgramDatabaseFile>.\Release/testsprite2.pdb</ProgramDatabaseFile>
  22.107        <SubSystem>Windows</SubSystem>
  22.108      </Link>
  22.109      <PostBuildEvent>
  22.110 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll
  22.111 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
  22.112 +copy $(SolutionDir)\..\test\icon.bmp $(ProjectDir)\icon.bmp</Command>
  22.113 +    </PostBuildEvent>
  22.114 +    <PostBuildEvent>
  22.115 +      <Message>Copy SDL and data files</Message>
  22.116 +    </PostBuildEvent>
  22.117 +  </ItemDefinitionGroup>
  22.118 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  22.119 +    <Midl>
  22.120 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  22.121 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  22.122 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  22.123 +    </Midl>
  22.124 +    <ClCompile>
  22.125 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
  22.126 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  22.127 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  22.128 +      <StringPooling>true</StringPooling>
  22.129 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  22.130 +      <FunctionLevelLinking>true</FunctionLevelLinking>
  22.131 +      <PrecompiledHeader>
  22.132 +      </PrecompiledHeader>
  22.133 +      <WarningLevel>Level3</WarningLevel>
  22.134 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  22.135 +      <CompileAs>Default</CompileAs>
  22.136 +    </ClCompile>
  22.137 +    <ResourceCompile>
  22.138 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  22.139 +      <Culture>0x0409</Culture>
  22.140 +    </ResourceCompile>
  22.141 +    <Link>
  22.142 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  22.143 +      <SubSystem>Windows</SubSystem>
  22.144 +    </Link>
  22.145 +    <PostBuildEvent>
  22.146 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
  22.147  copy $(SolutionDir)\..\test\icon.bmp $(ProjectDir)\icon.bmp</Command>
  22.148      </PostBuildEvent>
  22.149      <PostBuildEvent>
  22.150 @@ -95,7 +153,6 @@
  22.151        <MkTypLibCompatible>true</MkTypLibCompatible>
  22.152        <SuppressStartupBanner>true</SuppressStartupBanner>
  22.153        <TargetEnvironment>Win32</TargetEnvironment>
  22.154 -      <TypeLibraryName>.\Debug/testsprite2.tlb</TypeLibraryName>
  22.155      </Midl>
  22.156      <ClCompile>
  22.157        <Optimization>Disabled</Optimization>
  22.158 @@ -104,10 +161,6 @@
  22.159        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  22.160        <PrecompiledHeader>
  22.161        </PrecompiledHeader>
  22.162 -      <PrecompiledHeaderOutputFile>.\Debug/testsprite2.pch</PrecompiledHeaderOutputFile>
  22.163 -      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
  22.164 -      <ObjectFileName>.\Debug/</ObjectFileName>
  22.165 -      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
  22.166        <WarningLevel>Level3</WarningLevel>
  22.167        <SuppressStartupBanner>true</SuppressStartupBanner>
  22.168        <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
  22.169 @@ -118,15 +171,47 @@
  22.170        <Culture>0x0409</Culture>
  22.171      </ResourceCompile>
  22.172      <Link>
  22.173 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  22.174 -      <OutputFile>.\Debug/testsprite2.exe</OutputFile>
  22.175        <SuppressStartupBanner>true</SuppressStartupBanner>
  22.176        <GenerateDebugInformation>true</GenerateDebugInformation>
  22.177 -      <ProgramDatabaseFile>.\Debug/testsprite2.pdb</ProgramDatabaseFile>
  22.178        <SubSystem>Windows</SubSystem>
  22.179      </Link>
  22.180      <PostBuildEvent>
  22.181 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll
  22.182 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
  22.183 +copy $(SolutionDir)\..\test\icon.bmp $(ProjectDir)\icon.bmp</Command>
  22.184 +    </PostBuildEvent>
  22.185 +    <PostBuildEvent>
  22.186 +      <Message>Copy SDL and data files</Message>
  22.187 +    </PostBuildEvent>
  22.188 +  </ItemDefinitionGroup>
  22.189 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
  22.190 +    <Midl>
  22.191 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  22.192 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  22.193 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  22.194 +    </Midl>
  22.195 +    <ClCompile>
  22.196 +      <Optimization>Disabled</Optimization>
  22.197 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  22.198 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  22.199 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  22.200 +      <PrecompiledHeader>
  22.201 +      </PrecompiledHeader>
  22.202 +      <WarningLevel>Level3</WarningLevel>
  22.203 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  22.204 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
  22.205 +      <CompileAs>Default</CompileAs>
  22.206 +    </ClCompile>
  22.207 +    <ResourceCompile>
  22.208 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  22.209 +      <Culture>0x0409</Culture>
  22.210 +    </ResourceCompile>
  22.211 +    <Link>
  22.212 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  22.213 +      <GenerateDebugInformation>true</GenerateDebugInformation>
  22.214 +      <SubSystem>Windows</SubSystem>
  22.215 +    </Link>
  22.216 +    <PostBuildEvent>
  22.217 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
  22.218  copy $(SolutionDir)\..\test\icon.bmp $(ProjectDir)\icon.bmp</Command>
  22.219      </PostBuildEvent>
  22.220      <PostBuildEvent>
  22.221 @@ -138,8 +223,8 @@
  22.222      <ClCompile Include="..\..\..\test\testsprite2.c" />
  22.223    </ItemGroup>
  22.224    <ItemGroup>
  22.225 -    <Library Include="..\..\Sdl\Debug\SDL.lib" />
  22.226 -    <Library Include="..\..\SDLmain\Debug\SDLmain.lib" />
  22.227 +    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
  22.228 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
  22.229    </ItemGroup>
  22.230    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  22.231    <ImportGroup Label="ExtensionTargets">
    23.1 --- a/VisualC/tests/testvidinfo/testvidinfo_VS2010.vcxproj	Tue Apr 19 08:08:50 2011 -0700
    23.2 +++ b/VisualC/tests/testvidinfo/testvidinfo_VS2010.vcxproj	Tue Apr 19 09:53:01 2011 -0700
    23.3 @@ -5,10 +5,18 @@
    23.4        <Configuration>Debug</Configuration>
    23.5        <Platform>Win32</Platform>
    23.6      </ProjectConfiguration>
    23.7 +    <ProjectConfiguration Include="Debug|x64">
    23.8 +      <Configuration>Debug</Configuration>
    23.9 +      <Platform>x64</Platform>
   23.10 +    </ProjectConfiguration>
   23.11      <ProjectConfiguration Include="Release|Win32">
   23.12        <Configuration>Release</Configuration>
   23.13        <Platform>Win32</Platform>
   23.14      </ProjectConfiguration>
   23.15 +    <ProjectConfiguration Include="Release|x64">
   23.16 +      <Configuration>Release</Configuration>
   23.17 +      <Platform>x64</Platform>
   23.18 +    </ProjectConfiguration>
   23.19    </ItemGroup>
   23.20    <PropertyGroup Label="Globals">
   23.21      <ProjectName>testvidinfo</ProjectName>
   23.22 @@ -20,10 +28,19 @@
   23.23      <ConfigurationType>Application</ConfigurationType>
   23.24      <UseOfMfc>false</UseOfMfc>
   23.25    </PropertyGroup>
   23.26 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
   23.27 +    <ConfigurationType>Application</ConfigurationType>
   23.28 +    <UseOfMfc>false</UseOfMfc>
   23.29 +    <CharacterSet>MultiByte</CharacterSet>
   23.30 +  </PropertyGroup>
   23.31    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
   23.32      <ConfigurationType>Application</ConfigurationType>
   23.33      <UseOfMfc>false</UseOfMfc>
   23.34    </PropertyGroup>
   23.35 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
   23.36 +    <ConfigurationType>Application</ConfigurationType>
   23.37 +    <UseOfMfc>false</UseOfMfc>
   23.38 +  </PropertyGroup>
   23.39    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   23.40    <ImportGroup Label="ExtensionSettings">
   23.41    </ImportGroup>
   23.42 @@ -31,19 +48,33 @@
   23.43      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   23.44      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   23.45    </ImportGroup>
   23.46 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
   23.47 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   23.48 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   23.49 +  </ImportGroup>
   23.50    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
   23.51      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   23.52      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   23.53    </ImportGroup>
   23.54 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
   23.55 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   23.56 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   23.57 +  </ImportGroup>
   23.58    <PropertyGroup Label="UserMacros" />
   23.59    <PropertyGroup>
   23.60      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   23.61 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
   23.62 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
   23.63 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
   23.64 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
   23.65 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
   23.66 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
   23.67      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
   23.68 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
   23.69 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
   23.70 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   23.71 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
   23.72 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
   23.73 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
   23.74 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
   23.75      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
   23.76 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   23.77    </PropertyGroup>
   23.78    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   23.79      <Midl>
   23.80 @@ -51,7 +82,6 @@
   23.81        <MkTypLibCompatible>true</MkTypLibCompatible>
   23.82        <SuppressStartupBanner>true</SuppressStartupBanner>
   23.83        <TargetEnvironment>Win32</TargetEnvironment>
   23.84 -      <TypeLibraryName>.\Release/testvidinfo.tlb</TypeLibraryName>
   23.85      </Midl>
   23.86      <ClCompile>
   23.87        <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
   23.88 @@ -62,10 +92,6 @@
   23.89        <FunctionLevelLinking>true</FunctionLevelLinking>
   23.90        <PrecompiledHeader>
   23.91        </PrecompiledHeader>
   23.92 -      <PrecompiledHeaderOutputFile>.\Release/testvidinfo.pch</PrecompiledHeaderOutputFile>
   23.93 -      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
   23.94 -      <ObjectFileName>.\Release/</ObjectFileName>
   23.95 -      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
   23.96        <WarningLevel>Level3</WarningLevel>
   23.97        <SuppressStartupBanner>true</SuppressStartupBanner>
   23.98        <CompileAs>Default</CompileAs>
   23.99 @@ -75,14 +101,45 @@
  23.100        <Culture>0x0409</Culture>
  23.101      </ResourceCompile>
  23.102      <Link>
  23.103 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  23.104 -      <OutputFile>.\Release/testvidinfo.exe</OutputFile>
  23.105        <SuppressStartupBanner>true</SuppressStartupBanner>
  23.106 -      <ProgramDatabaseFile>.\Release/testvidinfo.pdb</ProgramDatabaseFile>
  23.107        <SubSystem>Windows</SubSystem>
  23.108      </Link>
  23.109      <PostBuildEvent>
  23.110 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll</Command>
  23.111 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  23.112 +    </PostBuildEvent>
  23.113 +    <PostBuildEvent>
  23.114 +      <Message>Copy SDL</Message>
  23.115 +    </PostBuildEvent>
  23.116 +  </ItemDefinitionGroup>
  23.117 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  23.118 +    <Midl>
  23.119 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  23.120 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  23.121 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  23.122 +    </Midl>
  23.123 +    <ClCompile>
  23.124 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
  23.125 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  23.126 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  23.127 +      <StringPooling>true</StringPooling>
  23.128 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  23.129 +      <FunctionLevelLinking>true</FunctionLevelLinking>
  23.130 +      <PrecompiledHeader>
  23.131 +      </PrecompiledHeader>
  23.132 +      <WarningLevel>Level3</WarningLevel>
  23.133 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  23.134 +      <CompileAs>Default</CompileAs>
  23.135 +    </ClCompile>
  23.136 +    <ResourceCompile>
  23.137 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  23.138 +      <Culture>0x0409</Culture>
  23.139 +    </ResourceCompile>
  23.140 +    <Link>
  23.141 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  23.142 +      <SubSystem>Windows</SubSystem>
  23.143 +    </Link>
  23.144 +    <PostBuildEvent>
  23.145 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  23.146      </PostBuildEvent>
  23.147      <PostBuildEvent>
  23.148        <Message>Copy SDL</Message>
  23.149 @@ -94,7 +151,6 @@
  23.150        <MkTypLibCompatible>true</MkTypLibCompatible>
  23.151        <SuppressStartupBanner>true</SuppressStartupBanner>
  23.152        <TargetEnvironment>Win32</TargetEnvironment>
  23.153 -      <TypeLibraryName>.\Debug/testvidinfo.tlb</TypeLibraryName>
  23.154      </Midl>
  23.155      <ClCompile>
  23.156        <Optimization>Disabled</Optimization>
  23.157 @@ -103,10 +159,6 @@
  23.158        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  23.159        <PrecompiledHeader>
  23.160        </PrecompiledHeader>
  23.161 -      <PrecompiledHeaderOutputFile>.\Debug/testvidinfo.pch</PrecompiledHeaderOutputFile>
  23.162 -      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
  23.163 -      <ObjectFileName>.\Debug/</ObjectFileName>
  23.164 -      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
  23.165        <WarningLevel>Level3</WarningLevel>
  23.166        <SuppressStartupBanner>true</SuppressStartupBanner>
  23.167        <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
  23.168 @@ -117,23 +169,54 @@
  23.169        <Culture>0x0409</Culture>
  23.170      </ResourceCompile>
  23.171      <Link>
  23.172 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  23.173 -      <OutputFile>.\Debug/testvidinfo.exe</OutputFile>
  23.174        <SuppressStartupBanner>true</SuppressStartupBanner>
  23.175        <GenerateDebugInformation>true</GenerateDebugInformation>
  23.176 -      <ProgramDatabaseFile>.\Debug/testvidinfo.pdb</ProgramDatabaseFile>
  23.177        <SubSystem>Windows</SubSystem>
  23.178      </Link>
  23.179      <PostBuildEvent>
  23.180 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll</Command>
  23.181 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  23.182 +    </PostBuildEvent>
  23.183 +    <PostBuildEvent>
  23.184 +      <Message>Copy SDL</Message>
  23.185 +    </PostBuildEvent>
  23.186 +  </ItemDefinitionGroup>
  23.187 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
  23.188 +    <Midl>
  23.189 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  23.190 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  23.191 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  23.192 +    </Midl>
  23.193 +    <ClCompile>
  23.194 +      <Optimization>Disabled</Optimization>
  23.195 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  23.196 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  23.197 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  23.198 +      <PrecompiledHeader>
  23.199 +      </PrecompiledHeader>
  23.200 +      <WarningLevel>Level3</WarningLevel>
  23.201 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  23.202 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
  23.203 +      <CompileAs>Default</CompileAs>
  23.204 +    </ClCompile>
  23.205 +    <ResourceCompile>
  23.206 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  23.207 +      <Culture>0x0409</Culture>
  23.208 +    </ResourceCompile>
  23.209 +    <Link>
  23.210 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  23.211 +      <GenerateDebugInformation>true</GenerateDebugInformation>
  23.212 +      <SubSystem>Windows</SubSystem>
  23.213 +    </Link>
  23.214 +    <PostBuildEvent>
  23.215 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll</Command>
  23.216      </PostBuildEvent>
  23.217      <PostBuildEvent>
  23.218        <Message>Copy SDL</Message>
  23.219      </PostBuildEvent>
  23.220    </ItemDefinitionGroup>
  23.221    <ItemGroup>
  23.222 -    <Library Include="..\..\Sdl\Debug\SDL.lib" />
  23.223 -    <Library Include="..\..\SDLmain\Debug\SDLmain.lib" />
  23.224 +    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
  23.225 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
  23.226    </ItemGroup>
  23.227    <ItemGroup>
  23.228      <ClCompile Include="..\..\..\Test\testvidinfo.c" />
    24.1 --- a/VisualC/tests/testwin/testwin_VS2010.vcxproj	Tue Apr 19 08:08:50 2011 -0700
    24.2 +++ b/VisualC/tests/testwin/testwin_VS2010.vcxproj	Tue Apr 19 09:53:01 2011 -0700
    24.3 @@ -5,10 +5,18 @@
    24.4        <Configuration>Debug</Configuration>
    24.5        <Platform>Win32</Platform>
    24.6      </ProjectConfiguration>
    24.7 +    <ProjectConfiguration Include="Debug|x64">
    24.8 +      <Configuration>Debug</Configuration>
    24.9 +      <Platform>x64</Platform>
   24.10 +    </ProjectConfiguration>
   24.11      <ProjectConfiguration Include="Release|Win32">
   24.12        <Configuration>Release</Configuration>
   24.13        <Platform>Win32</Platform>
   24.14      </ProjectConfiguration>
   24.15 +    <ProjectConfiguration Include="Release|x64">
   24.16 +      <Configuration>Release</Configuration>
   24.17 +      <Platform>x64</Platform>
   24.18 +    </ProjectConfiguration>
   24.19    </ItemGroup>
   24.20    <PropertyGroup Label="Globals">
   24.21      <ProjectName>testwin</ProjectName>
   24.22 @@ -20,10 +28,19 @@
   24.23      <ConfigurationType>Application</ConfigurationType>
   24.24      <UseOfMfc>false</UseOfMfc>
   24.25    </PropertyGroup>
   24.26 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
   24.27 +    <ConfigurationType>Application</ConfigurationType>
   24.28 +    <UseOfMfc>false</UseOfMfc>
   24.29 +  </PropertyGroup>
   24.30    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
   24.31      <ConfigurationType>Application</ConfigurationType>
   24.32      <UseOfMfc>false</UseOfMfc>
   24.33    </PropertyGroup>
   24.34 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
   24.35 +    <ConfigurationType>Application</ConfigurationType>
   24.36 +    <UseOfMfc>false</UseOfMfc>
   24.37 +    <CharacterSet>MultiByte</CharacterSet>
   24.38 +  </PropertyGroup>
   24.39    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   24.40    <ImportGroup Label="ExtensionSettings">
   24.41    </ImportGroup>
   24.42 @@ -31,19 +48,33 @@
   24.43      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   24.44      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   24.45    </ImportGroup>
   24.46 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
   24.47 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   24.48 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   24.49 +  </ImportGroup>
   24.50    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
   24.51      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   24.52      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   24.53    </ImportGroup>
   24.54 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
   24.55 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   24.56 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   24.57 +  </ImportGroup>
   24.58    <PropertyGroup Label="UserMacros" />
   24.59    <PropertyGroup>
   24.60      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   24.61 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
   24.62 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
   24.63 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
   24.64 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
   24.65 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
   24.66 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
   24.67      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
   24.68 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
   24.69 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
   24.70 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   24.71 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
   24.72 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
   24.73 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
   24.74 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
   24.75      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
   24.76 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   24.77    </PropertyGroup>
   24.78    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   24.79      <Midl>
   24.80 @@ -51,7 +82,6 @@
   24.81        <MkTypLibCompatible>true</MkTypLibCompatible>
   24.82        <SuppressStartupBanner>true</SuppressStartupBanner>
   24.83        <TargetEnvironment>Win32</TargetEnvironment>
   24.84 -      <TypeLibraryName>.\Debug/testwin.tlb</TypeLibraryName>
   24.85      </Midl>
   24.86      <ClCompile>
   24.87        <Optimization>Disabled</Optimization>
   24.88 @@ -60,10 +90,6 @@
   24.89        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   24.90        <PrecompiledHeader>
   24.91        </PrecompiledHeader>
   24.92 -      <PrecompiledHeaderOutputFile>.\Debug/testwin.pch</PrecompiledHeaderOutputFile>
   24.93 -      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
   24.94 -      <ObjectFileName>.\Debug/</ObjectFileName>
   24.95 -      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
   24.96        <WarningLevel>Level3</WarningLevel>
   24.97        <SuppressStartupBanner>true</SuppressStartupBanner>
   24.98        <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
   24.99 @@ -74,15 +100,47 @@
  24.100        <Culture>0x0409</Culture>
  24.101      </ResourceCompile>
  24.102      <Link>
  24.103 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  24.104 -      <OutputFile>.\Debug/testwin.exe</OutputFile>
  24.105        <SuppressStartupBanner>true</SuppressStartupBanner>
  24.106        <GenerateDebugInformation>true</GenerateDebugInformation>
  24.107 -      <ProgramDatabaseFile>.\Debug/testwin.pdb</ProgramDatabaseFile>
  24.108        <SubSystem>Windows</SubSystem>
  24.109      </Link>
  24.110      <PostBuildEvent>
  24.111 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll
  24.112 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
  24.113 +copy $(SolutionDir)\..\test\sample.bmp $(ProjectDir)\sample.bmp</Command>
  24.114 +    </PostBuildEvent>
  24.115 +    <PostBuildEvent>
  24.116 +      <Message>Copy SDL and data files</Message>
  24.117 +    </PostBuildEvent>
  24.118 +  </ItemDefinitionGroup>
  24.119 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
  24.120 +    <Midl>
  24.121 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  24.122 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  24.123 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  24.124 +    </Midl>
  24.125 +    <ClCompile>
  24.126 +      <Optimization>Disabled</Optimization>
  24.127 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  24.128 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  24.129 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  24.130 +      <PrecompiledHeader>
  24.131 +      </PrecompiledHeader>
  24.132 +      <WarningLevel>Level3</WarningLevel>
  24.133 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  24.134 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
  24.135 +      <CompileAs>Default</CompileAs>
  24.136 +    </ClCompile>
  24.137 +    <ResourceCompile>
  24.138 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  24.139 +      <Culture>0x0409</Culture>
  24.140 +    </ResourceCompile>
  24.141 +    <Link>
  24.142 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  24.143 +      <GenerateDebugInformation>true</GenerateDebugInformation>
  24.144 +      <SubSystem>Windows</SubSystem>
  24.145 +    </Link>
  24.146 +    <PostBuildEvent>
  24.147 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
  24.148  copy $(SolutionDir)\..\test\sample.bmp $(ProjectDir)\sample.bmp</Command>
  24.149      </PostBuildEvent>
  24.150      <PostBuildEvent>
  24.151 @@ -95,7 +153,6 @@
  24.152        <MkTypLibCompatible>true</MkTypLibCompatible>
  24.153        <SuppressStartupBanner>true</SuppressStartupBanner>
  24.154        <TargetEnvironment>Win32</TargetEnvironment>
  24.155 -      <TypeLibraryName>.\Release/testwin.tlb</TypeLibraryName>
  24.156      </Midl>
  24.157      <ClCompile>
  24.158        <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
  24.159 @@ -106,10 +163,6 @@
  24.160        <FunctionLevelLinking>true</FunctionLevelLinking>
  24.161        <PrecompiledHeader>
  24.162        </PrecompiledHeader>
  24.163 -      <PrecompiledHeaderOutputFile>.\Release/testwin.pch</PrecompiledHeaderOutputFile>
  24.164 -      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
  24.165 -      <ObjectFileName>.\Release/</ObjectFileName>
  24.166 -      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
  24.167        <WarningLevel>Level3</WarningLevel>
  24.168        <SuppressStartupBanner>true</SuppressStartupBanner>
  24.169        <CompileAs>Default</CompileAs>
  24.170 @@ -119,23 +172,56 @@
  24.171        <Culture>0x0409</Culture>
  24.172      </ResourceCompile>
  24.173      <Link>
  24.174 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  24.175 -      <OutputFile>.\Release/testwin.exe</OutputFile>
  24.176        <SuppressStartupBanner>true</SuppressStartupBanner>
  24.177 -      <ProgramDatabaseFile>.\Release/testwin.pdb</ProgramDatabaseFile>
  24.178        <SubSystem>Windows</SubSystem>
  24.179      </Link>
  24.180      <PostBuildEvent>
  24.181 -      <Command>copy $(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll $(TargetDir)\SDL.dll
  24.182 +      <Command>copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
  24.183  copy $(SolutionDir)\..\test\sample.bmp $(ProjectDir)\sample.bmp</Command>
  24.184      </PostBuildEvent>
  24.185      <PostBuildEvent>
  24.186        <Message>Copy SDL and data files</Message>
  24.187      </PostBuildEvent>
  24.188    </ItemDefinitionGroup>
  24.189 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  24.190 +    <Midl>
  24.191 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  24.192 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  24.193 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  24.194 +    </Midl>
  24.195 +    <ClCompile>
  24.196 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
  24.197 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  24.198 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  24.199 +      <StringPooling>true</StringPooling>
  24.200 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  24.201 +      <FunctionLevelLinking>true</FunctionLevelLinking>
  24.202 +      <PrecompiledHeader>
  24.203 +      </PrecompiledHeader>
  24.204 +      <WarningLevel>Level3</WarningLevel>
  24.205 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  24.206 +      <CompileAs>Default</CompileAs>
  24.207 +    </ClCompile>
  24.208 +    <ResourceCompile>
  24.209 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  24.210 +      <Culture>0x0409</Culture>
  24.211 +    </ResourceCompile>
  24.212 +    <Link>
  24.213 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  24.214 +      <SubSystem>Windows</SubSystem>
  24.215 +    </Link>
  24.216 +    <PostBuildEvent>
  24.217 +      <Command>
  24.218 +        copy $(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll $(TargetDir)\SDL.dll
  24.219 +        copy $(SolutionDir)\..\test\sample.bmp $(ProjectDir)\sample.bmp</Command>
  24.220 +    </PostBuildEvent>
  24.221 +    <PostBuildEvent>
  24.222 +      <Message>Copy SDL and data files</Message>
  24.223 +    </PostBuildEvent>
  24.224 +  </ItemDefinitionGroup>
  24.225    <ItemGroup>
  24.226 -    <Library Include="..\..\Sdl\Debug\SDL.lib" />
  24.227 -    <Library Include="..\..\SDLmain\Debug\SDLmain.lib" />
  24.228 +    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
  24.229 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
  24.230    </ItemGroup>
  24.231    <ItemGroup>
  24.232      <ClCompile Include="..\..\..\Test\Testwin.c" />
    25.1 --- a/VisualC/tests/testwm/testwm_VS2010.vcxproj	Tue Apr 19 08:08:50 2011 -0700
    25.2 +++ b/VisualC/tests/testwm/testwm_VS2010.vcxproj	Tue Apr 19 09:53:01 2011 -0700
    25.3 @@ -5,10 +5,18 @@
    25.4        <Configuration>Debug</Configuration>
    25.5        <Platform>Win32</Platform>
    25.6      </ProjectConfiguration>
    25.7 +    <ProjectConfiguration Include="Debug|x64">
    25.8 +      <Configuration>Debug</Configuration>
    25.9 +      <Platform>x64</Platform>
   25.10 +    </ProjectConfiguration>
   25.11      <ProjectConfiguration Include="Release|Win32">
   25.12        <Configuration>Release</Configuration>
   25.13        <Platform>Win32</Platform>
   25.14      </ProjectConfiguration>
   25.15 +    <ProjectConfiguration Include="Release|x64">
   25.16 +      <Configuration>Release</Configuration>
   25.17 +      <Platform>x64</Platform>
   25.18 +    </ProjectConfiguration>
   25.19    </ItemGroup>
   25.20    <PropertyGroup Label="Globals">
   25.21      <ProjectName>testwm</ProjectName>
   25.22 @@ -20,10 +28,19 @@
   25.23      <ConfigurationType>Application</ConfigurationType>
   25.24      <UseOfMfc>false</UseOfMfc>
   25.25    </PropertyGroup>
   25.26 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
   25.27 +    <ConfigurationType>Application</ConfigurationType>
   25.28 +    <UseOfMfc>false</UseOfMfc>
   25.29 +  </PropertyGroup>
   25.30    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
   25.31      <ConfigurationType>Application</ConfigurationType>
   25.32      <UseOfMfc>false</UseOfMfc>
   25.33    </PropertyGroup>
   25.34 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
   25.35 +    <ConfigurationType>Application</ConfigurationType>
   25.36 +    <UseOfMfc>false</UseOfMfc>
   25.37 +    <CharacterSet>MultiByte</CharacterSet>
   25.38 +  </PropertyGroup>
   25.39    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   25.40    <ImportGroup Label="ExtensionSettings">
   25.41    </ImportGroup>
   25.42 @@ -31,19 +48,33 @@
   25.43      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   25.44      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   25.45    </ImportGroup>
   25.46 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
   25.47 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   25.48 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   25.49 +  </ImportGroup>
   25.50    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
   25.51      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   25.52      <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   25.53    </ImportGroup>
   25.54 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
   25.55 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   25.56 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
   25.57 +  </ImportGroup>
   25.58    <PropertyGroup Label="UserMacros" />
   25.59    <PropertyGroup>
   25.60      <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   25.61 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
   25.62 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
   25.63 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
   25.64 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
   25.65 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
   25.66 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
   25.67      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
   25.68 -    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
   25.69 -    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
   25.70 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   25.71 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
   25.72 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
   25.73 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
   25.74 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
   25.75      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
   25.76 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   25.77    </PropertyGroup>
   25.78    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   25.79      <Midl>
   25.80 @@ -51,7 +82,6 @@
   25.81        <MkTypLibCompatible>true</MkTypLibCompatible>
   25.82        <SuppressStartupBanner>true</SuppressStartupBanner>
   25.83        <TargetEnvironment>Win32</TargetEnvironment>
   25.84 -      <TypeLibraryName>.\Debug/testwm.tlb</TypeLibraryName>
   25.85      </Midl>
   25.86      <ClCompile>
   25.87        <Optimization>Disabled</Optimization>
   25.88 @@ -60,10 +90,6 @@
   25.89        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
   25.90        <PrecompiledHeader>
   25.91        </PrecompiledHeader>
   25.92 -      <PrecompiledHeaderOutputFile>.\Debug/testwm.pch</PrecompiledHeaderOutputFile>
   25.93 -      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
   25.94 -      <ObjectFileName>.\Debug/</ObjectFileName>
   25.95 -      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
   25.96        <WarningLevel>Level3</WarningLevel>
   25.97        <SuppressStartupBanner>true</SuppressStartupBanner>
   25.98        <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
   25.99 @@ -74,15 +100,46 @@
  25.100        <Culture>0x0409</Culture>
  25.101      </ResourceCompile>
  25.102      <Link>
  25.103 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  25.104 -      <OutputFile>.\Debug/testwm.exe</OutputFile>
  25.105        <SuppressStartupBanner>true</SuppressStartupBanner>
  25.106        <GenerateDebugInformation>true</GenerateDebugInformation>
  25.107 -      <ProgramDatabaseFile>.\Debug/testwm.pdb</ProgramDatabaseFile>
  25.108        <SubSystem>Windows</SubSystem>
  25.109      </Link>
  25.110      <PostBuildEvent>
  25.111 -      <Command>copy "$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
  25.112 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
  25.113 +    </PostBuildEvent>
  25.114 +    <PostBuildEvent>
  25.115 +      <Message>Copy SDL</Message>
  25.116 +    </PostBuildEvent>
  25.117 +  </ItemDefinitionGroup>
  25.118 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
  25.119 +    <Midl>
  25.120 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  25.121 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  25.122 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  25.123 +    </Midl>
  25.124 +    <ClCompile>
  25.125 +      <Optimization>Disabled</Optimization>
  25.126 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  25.127 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  25.128 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  25.129 +      <PrecompiledHeader>
  25.130 +      </PrecompiledHeader>
  25.131 +      <WarningLevel>Level3</WarningLevel>
  25.132 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  25.133 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
  25.134 +      <CompileAs>Default</CompileAs>
  25.135 +    </ClCompile>
  25.136 +    <ResourceCompile>
  25.137 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  25.138 +      <Culture>0x0409</Culture>
  25.139 +    </ResourceCompile>
  25.140 +    <Link>
  25.141 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  25.142 +      <GenerateDebugInformation>true</GenerateDebugInformation>
  25.143 +      <SubSystem>Windows</SubSystem>
  25.144 +    </Link>
  25.145 +    <PostBuildEvent>
  25.146 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
  25.147      </PostBuildEvent>
  25.148      <PostBuildEvent>
  25.149        <Message>Copy SDL</Message>
  25.150 @@ -94,7 +151,6 @@
  25.151        <MkTypLibCompatible>true</MkTypLibCompatible>
  25.152        <SuppressStartupBanner>true</SuppressStartupBanner>
  25.153        <TargetEnvironment>Win32</TargetEnvironment>
  25.154 -      <TypeLibraryName>.\Release/testwm.tlb</TypeLibraryName>
  25.155      </Midl>
  25.156      <ClCompile>
  25.157        <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
  25.158 @@ -105,10 +161,6 @@
  25.159        <FunctionLevelLinking>true</FunctionLevelLinking>
  25.160        <PrecompiledHeader>
  25.161        </PrecompiledHeader>
  25.162 -      <PrecompiledHeaderOutputFile>.\Release/testwm.pch</PrecompiledHeaderOutputFile>
  25.163 -      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
  25.164 -      <ObjectFileName>.\Release/</ObjectFileName>
  25.165 -      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
  25.166        <WarningLevel>Level3</WarningLevel>
  25.167        <SuppressStartupBanner>true</SuppressStartupBanner>
  25.168        <CompileAs>Default</CompileAs>
  25.169 @@ -118,22 +170,53 @@
  25.170        <Culture>0x0409</Culture>
  25.171      </ResourceCompile>
  25.172      <Link>
  25.173 -      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
  25.174 -      <OutputFile>.\Release/testwm.exe</OutputFile>
  25.175        <SuppressStartupBanner>true</SuppressStartupBanner>
  25.176 -      <ProgramDatabaseFile>.\Release/testwm.pdb</ProgramDatabaseFile>
  25.177        <SubSystem>Windows</SubSystem>
  25.178      </Link>
  25.179      <PostBuildEvent>
  25.180 -      <Command>copy "$(SolutionDir)\SDL\$(ConfigurationName)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
  25.181 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
  25.182 +    </PostBuildEvent>
  25.183 +    <PostBuildEvent>
  25.184 +      <Message>Copy SDL</Message>
  25.185 +    </PostBuildEvent>
  25.186 +  </ItemDefinitionGroup>
  25.187 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  25.188 +    <Midl>
  25.189 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  25.190 +      <MkTypLibCompatible>true</MkTypLibCompatible>
  25.191 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  25.192 +    </Midl>
  25.193 +    <ClCompile>
  25.194 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
  25.195 +      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  25.196 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  25.197 +      <StringPooling>true</StringPooling>
  25.198 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  25.199 +      <FunctionLevelLinking>true</FunctionLevelLinking>
  25.200 +      <PrecompiledHeader>
  25.201 +      </PrecompiledHeader>
  25.202 +      <WarningLevel>Level3</WarningLevel>
  25.203 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  25.204 +      <CompileAs>Default</CompileAs>
  25.205 +    </ClCompile>
  25.206 +    <ResourceCompile>
  25.207 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  25.208 +      <Culture>0x0409</Culture>
  25.209 +    </ResourceCompile>
  25.210 +    <Link>
  25.211 +      <SuppressStartupBanner>true</SuppressStartupBanner>
  25.212 +      <SubSystem>Windows</SubSystem>
  25.213 +    </Link>
  25.214 +    <PostBuildEvent>
  25.215 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
  25.216      </PostBuildEvent>
  25.217      <PostBuildEvent>
  25.218        <Message>Copy SDL</Message>
  25.219      </PostBuildEvent>
  25.220    </ItemDefinitionGroup>
  25.221    <ItemGroup>
  25.222 -    <Library Include="..\..\Sdl\Debug\SDL.lib" />
  25.223 -    <Library Include="..\..\SDLmain\Debug\SDLmain.lib" />
  25.224 +    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
  25.225 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
  25.226    </ItemGroup>
  25.227    <ItemGroup>
  25.228      <ClCompile Include="..\..\..\test\testwm.c" />