Fix bug 1492: Visual Studio builds sdl.lib and sdl.dll for version 2.0 (contributed by Jan Reitz); update SDL_bool handling in test_common to fix VS compiler warnings
authorAndreas Schiffler <aschiffler@ferzkopp.net>
Thu, 30 May 2013 20:03:56 -0700
changeset 7249606c8fcfef2f
parent 7248 52d3427f8b5a
child 7250 bbb6b079cfe5
Fix bug 1492: Visual Studio builds sdl.lib and sdl.dll for version 2.0 (contributed by Jan Reitz); update SDL_bool handling in test_common to fix VS compiler warnings
VisualC/SDL/SDL_VS2012.vcxproj
VisualC/SDLmain/SDLmain_VS2012.vcxproj
VisualC/SDLtest/SDLtest_VS2012.vcxproj
VisualC/tests/checkkeys/checkkeys_VS2012.vcxproj
VisualC/tests/loopwave/loopwave_VS2012.vcxproj
VisualC/tests/testautomation/testautomation_vs2012.vcxproj
VisualC/tests/testdraw2/testdraw2_VS2012.vcxproj
VisualC/tests/testfile/testfile_VS2012.vcxproj
VisualC/tests/testgamecontroller/testgamecontroller_VS2010.vcxproj
VisualC/tests/testgl2/testgl2_VS2012.vcxproj
VisualC/tests/testplatform/testplatform_VS2012.vcxproj
VisualC/tests/testpower/testpower_VS2012.vcxproj
VisualC/tests/testshape/testshape_VS2012.vcxproj
VisualC/tests/testsprite2/testsprite2_VS2012.vcxproj
VisualC/tests/testvidinfo/testvidinfo_VS2010.vcxproj
src/test/SDL_test_common.c
     1.1 --- a/VisualC/SDL/SDL_VS2012.vcxproj	Thu May 30 22:14:24 2013 -0400
     1.2 +++ b/VisualC/SDL/SDL_VS2012.vcxproj	Thu May 30 20:03:56 2013 -0700
     1.3 @@ -19,7 +19,7 @@
     1.4      </ProjectConfiguration>
     1.5    </ItemGroup>
     1.6    <PropertyGroup Label="Globals">
     1.7 -    <ProjectName>SDL</ProjectName>
     1.8 +    <ProjectName>SDL2</ProjectName>
     1.9      <ProjectGuid>{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}</ProjectGuid>
    1.10      <RootNamespace>SDL</RootNamespace>
    1.11    </PropertyGroup>
     2.1 --- a/VisualC/SDLmain/SDLmain_VS2012.vcxproj	Thu May 30 22:14:24 2013 -0400
     2.2 +++ b/VisualC/SDLmain/SDLmain_VS2012.vcxproj	Thu May 30 20:03:56 2013 -0700
     2.3 @@ -19,7 +19,7 @@
     2.4      </ProjectConfiguration>
     2.5    </ItemGroup>
     2.6    <PropertyGroup Label="Globals">
     2.7 -    <ProjectName>SDLmain</ProjectName>
     2.8 +    <ProjectName>SDL2main</ProjectName>
     2.9      <ProjectGuid>{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}</ProjectGuid>
    2.10    </PropertyGroup>
    2.11    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
     3.1 --- a/VisualC/SDLtest/SDLtest_VS2012.vcxproj	Thu May 30 22:14:24 2013 -0400
     3.2 +++ b/VisualC/SDLtest/SDLtest_VS2012.vcxproj	Thu May 30 20:03:56 2013 -0700
     3.3 @@ -19,7 +19,7 @@
     3.4      </ProjectConfiguration>
     3.5    </ItemGroup>
     3.6    <PropertyGroup Label="Globals">
     3.7 -    <ProjectName>SDLtest</ProjectName>
     3.8 +    <ProjectName>SDL2test</ProjectName>
     3.9      <ProjectGuid>{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}</ProjectGuid>
    3.10    </PropertyGroup>
    3.11    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
     4.1 --- a/VisualC/tests/checkkeys/checkkeys_VS2012.vcxproj	Thu May 30 22:14:24 2013 -0400
     4.2 +++ b/VisualC/tests/checkkeys/checkkeys_VS2012.vcxproj	Thu May 30 20:03:56 2013 -0700
     4.3 @@ -109,7 +109,7 @@
     4.4        <SubSystem>Windows</SubSystem>
     4.5      </Link>
     4.6      <PostBuildEvent>
     4.7 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
     4.8 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
     4.9      </PostBuildEvent>
    4.10      <PostBuildEvent>
    4.11        <Message>Copy SDL</Message>
    4.12 @@ -143,7 +143,7 @@
    4.13        <SubSystem>Windows</SubSystem>
    4.14      </Link>
    4.15      <PostBuildEvent>
    4.16 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
    4.17 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
    4.18      </PostBuildEvent>
    4.19      <PostBuildEvent>
    4.20        <Message>Copy SDL</Message>
    4.21 @@ -178,7 +178,7 @@
    4.22        <SubSystem>Windows</SubSystem>
    4.23      </Link>
    4.24      <PostBuildEvent>
    4.25 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
    4.26 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
    4.27      </PostBuildEvent>
    4.28      <PostBuildEvent>
    4.29        <Message>Copy SDL</Message>
    4.30 @@ -212,7 +212,7 @@
    4.31        <SubSystem>Windows</SubSystem>
    4.32      </Link>
    4.33      <PostBuildEvent>
    4.34 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
    4.35 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
    4.36      </PostBuildEvent>
    4.37      <PostBuildEvent>
    4.38        <Message>Copy SDL</Message>
    4.39 @@ -222,8 +222,8 @@
    4.40      <ClCompile Include="..\..\..\test\checkkeys.c" />
    4.41    </ItemGroup>
    4.42    <ItemGroup>
    4.43 -    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
    4.44 -    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
    4.45 +    <Library Include="..\..\SDL\$(Platform)\$(Configuration)\SDL2.lib" />
    4.46 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDL2main.lib" />
    4.47    </ItemGroup>
    4.48    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    4.49    <ImportGroup Label="ExtensionTargets">
     5.1 --- a/VisualC/tests/loopwave/loopwave_VS2012.vcxproj	Thu May 30 22:14:24 2013 -0400
     5.2 +++ b/VisualC/tests/loopwave/loopwave_VS2012.vcxproj	Thu May 30 20:03:56 2013 -0700
     5.3 @@ -109,7 +109,7 @@
     5.4        <SubSystem>Windows</SubSystem>
     5.5      </Link>
     5.6      <PostBuildEvent>
     5.7 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
     5.8 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
     5.9      </PostBuildEvent>
    5.10      <PostBuildEvent>
    5.11        <Message>Copy SDL</Message>
    5.12 @@ -143,7 +143,7 @@
    5.13        <SubSystem>Windows</SubSystem>
    5.14      </Link>
    5.15      <PostBuildEvent>
    5.16 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
    5.17 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
    5.18      </PostBuildEvent>
    5.19      <PostBuildEvent>
    5.20        <Message>Copy SDL</Message>
    5.21 @@ -178,7 +178,7 @@
    5.22        <SubSystem>Windows</SubSystem>
    5.23      </Link>
    5.24      <PostBuildEvent>
    5.25 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
    5.26 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
    5.27      </PostBuildEvent>
    5.28      <PostBuildEvent>
    5.29        <Message>Copy SDL</Message>
    5.30 @@ -212,7 +212,7 @@
    5.31        <SubSystem>Windows</SubSystem>
    5.32      </Link>
    5.33      <PostBuildEvent>
    5.34 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
    5.35 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
    5.36      </PostBuildEvent>
    5.37      <PostBuildEvent>
    5.38        <Message>Copy SDL</Message>
    5.39 @@ -222,8 +222,8 @@
    5.40      <ClCompile Include="..\..\..\Test\Loopwave.c" />
    5.41    </ItemGroup>
    5.42    <ItemGroup>
    5.43 -    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
    5.44 -    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
    5.45 +    <Library Include="..\..\SDL\$(Platform)\$(Configuration)\SDL2.lib" />
    5.46 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDL2main.lib" />
    5.47    </ItemGroup>
    5.48    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    5.49    <ImportGroup Label="ExtensionTargets">
     6.1 --- a/VisualC/tests/testautomation/testautomation_vs2012.vcxproj	Thu May 30 22:14:24 2013 -0400
     6.2 +++ b/VisualC/tests/testautomation/testautomation_vs2012.vcxproj	Thu May 30 20:03:56 2013 -0700
     6.3 @@ -97,7 +97,7 @@
     6.4        <TargetMachine>MachineX86</TargetMachine>
     6.5      </Link>
     6.6      <PostBuildEvent>
     6.7 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
     6.8 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
     6.9      </PostBuildEvent>
    6.10      <PostBuildEvent>
    6.11        <Message>Copy SDL</Message>
    6.12 @@ -120,7 +120,7 @@
    6.13        <SubSystem>Windows</SubSystem>
    6.14      </Link>
    6.15      <PostBuildEvent>
    6.16 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
    6.17 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
    6.18      </PostBuildEvent>
    6.19      <PostBuildEvent>
    6.20        <Message>Copy SDL</Message>
    6.21 @@ -147,7 +147,7 @@
    6.22        <TargetMachine>MachineX86</TargetMachine>
    6.23      </Link>
    6.24      <PostBuildEvent>
    6.25 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
    6.26 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
    6.27      </PostBuildEvent>
    6.28      <PostBuildEvent>
    6.29        <Message>Copy SDL</Message>
    6.30 @@ -173,7 +173,7 @@
    6.31        <EnableCOMDATFolding>true</EnableCOMDATFolding>
    6.32      </Link>
    6.33      <PostBuildEvent>
    6.34 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
    6.35 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
    6.36      </PostBuildEvent>
    6.37      <PostBuildEvent>
    6.38        <Message>Copy SDL</Message>
    6.39 @@ -203,9 +203,9 @@
    6.40      <ClInclude Include="..\..\..\test\testautomation_suites.h" />
    6.41    </ItemGroup>
    6.42    <ItemGroup>
    6.43 -    <Library Include="..\..\SDL\$(Platform)\$(Configuration)\SDL.lib" />
    6.44 -    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
    6.45 -    <Library Include="..\..\SDLtest\$(Platform)\$(Configuration)\SDLtest.lib" />
    6.46 +    <Library Include="..\..\SDL\$(Platform)\$(Configuration)\SDL2.lib" />
    6.47 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDL2main.lib" />
    6.48 +    <Library Include="..\..\SDLtest\$(Platform)\$(Configuration)\SDL2test.lib" />
    6.49    </ItemGroup>
    6.50    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    6.51    <ImportGroup Label="ExtensionTargets">
     7.1 --- a/VisualC/tests/testdraw2/testdraw2_VS2012.vcxproj	Thu May 30 22:14:24 2013 -0400
     7.2 +++ b/VisualC/tests/testdraw2/testdraw2_VS2012.vcxproj	Thu May 30 20:03:56 2013 -0700
     7.3 @@ -109,7 +109,7 @@
     7.4        <SubSystem>Windows</SubSystem>
     7.5      </Link>
     7.6      <PostBuildEvent>
     7.7 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
     7.8 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
     7.9      </PostBuildEvent>
    7.10      <PostBuildEvent>
    7.11        <Message>Copy SDL</Message>
    7.12 @@ -143,7 +143,7 @@
    7.13        <SubSystem>Windows</SubSystem>
    7.14      </Link>
    7.15      <PostBuildEvent>
    7.16 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
    7.17 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
    7.18      </PostBuildEvent>
    7.19      <PostBuildEvent>
    7.20        <Message>Copy SDL</Message>
    7.21 @@ -178,7 +178,7 @@
    7.22        <SubSystem>Windows</SubSystem>
    7.23      </Link>
    7.24      <PostBuildEvent>
    7.25 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
    7.26 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
    7.27      </PostBuildEvent>
    7.28      <PostBuildEvent>
    7.29        <Message>Copy SDL</Message>
    7.30 @@ -212,7 +212,7 @@
    7.31        <SubSystem>Windows</SubSystem>
    7.32      </Link>
    7.33      <PostBuildEvent>
    7.34 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
    7.35 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
    7.36      </PostBuildEvent>
    7.37      <PostBuildEvent>
    7.38        <Message>Copy SDL</Message>
    7.39 @@ -222,9 +222,9 @@
    7.40      <ClCompile Include="..\..\..\test\testdraw2.c" />
    7.41    </ItemGroup>
    7.42    <ItemGroup>
    7.43 -    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
    7.44 -    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
    7.45 -    <Library Include="..\..\SDLtest\$(Platform)\$(Configuration)\SDLtest.lib" />
    7.46 +    <Library Include="..\..\SDL\$(Platform)\$(Configuration)\SDL2.lib" />
    7.47 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDL2main.lib" />
    7.48 +    <Library Include="..\..\SDLtest\$(Platform)\$(Configuration)\SDL2test.lib" />
    7.49    </ItemGroup>
    7.50    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    7.51    <ImportGroup Label="ExtensionTargets">
     8.1 --- a/VisualC/tests/testfile/testfile_VS2012.vcxproj	Thu May 30 22:14:24 2013 -0400
     8.2 +++ b/VisualC/tests/testfile/testfile_VS2012.vcxproj	Thu May 30 20:03:56 2013 -0700
     8.3 @@ -109,7 +109,7 @@
     8.4        <SubSystem>Windows</SubSystem>
     8.5      </Link>
     8.6      <PostBuildEvent>
     8.7 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
     8.8 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
     8.9      </PostBuildEvent>
    8.10      <PostBuildEvent>
    8.11        <Message>Copy SDL</Message>
    8.12 @@ -143,7 +143,7 @@
    8.13        <SubSystem>Windows</SubSystem>
    8.14      </Link>
    8.15      <PostBuildEvent>
    8.16 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
    8.17 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
    8.18      </PostBuildEvent>
    8.19      <PostBuildEvent>
    8.20        <Message>Copy SDL</Message>
    8.21 @@ -178,7 +178,7 @@
    8.22        <SubSystem>Windows</SubSystem>
    8.23      </Link>
    8.24      <PostBuildEvent>
    8.25 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
    8.26 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
    8.27      </PostBuildEvent>
    8.28      <PostBuildEvent>
    8.29        <Message>Copy SDL</Message>
    8.30 @@ -212,15 +212,15 @@
    8.31        <SubSystem>Windows</SubSystem>
    8.32      </Link>
    8.33      <PostBuildEvent>
    8.34 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
    8.35 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
    8.36      </PostBuildEvent>
    8.37      <PostBuildEvent>
    8.38        <Message>Copy SDL</Message>
    8.39      </PostBuildEvent>
    8.40    </ItemDefinitionGroup>
    8.41    <ItemGroup>
    8.42 -    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
    8.43 -    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
    8.44 +    <Library Include="..\..\SDL\$(Platform)\$(Configuration)\SDL2.lib" />
    8.45 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDL2main.lib" />
    8.46    </ItemGroup>
    8.47    <ItemGroup>
    8.48      <ClCompile Include="..\..\..\Test\testfile.c" />
     9.1 --- a/VisualC/tests/testgamecontroller/testgamecontroller_VS2010.vcxproj	Thu May 30 22:14:24 2013 -0400
     9.2 +++ b/VisualC/tests/testgamecontroller/testgamecontroller_VS2010.vcxproj	Thu May 30 20:03:56 2013 -0700
     9.3 @@ -105,7 +105,7 @@
     9.4        <SubSystem>Windows</SubSystem>
     9.5      </Link>
     9.6      <PostBuildEvent>
     9.7 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
     9.8 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
     9.9      </PostBuildEvent>
    9.10      <PostBuildEvent>
    9.11        <Message>Copy SDL</Message>
    9.12 @@ -139,7 +139,7 @@
    9.13        <SubSystem>Windows</SubSystem>
    9.14      </Link>
    9.15      <PostBuildEvent>
    9.16 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
    9.17 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
    9.18      </PostBuildEvent>
    9.19      <PostBuildEvent>
    9.20        <Message>Copy SDL</Message>
    9.21 @@ -174,7 +174,7 @@
    9.22        <SubSystem>Windows</SubSystem>
    9.23      </Link>
    9.24      <PostBuildEvent>
    9.25 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
    9.26 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
    9.27      </PostBuildEvent>
    9.28      <PostBuildEvent>
    9.29        <Message>Copy SDL</Message>
    9.30 @@ -208,15 +208,15 @@
    9.31        <SubSystem>Windows</SubSystem>
    9.32      </Link>
    9.33      <PostBuildEvent>
    9.34 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
    9.35 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
    9.36      </PostBuildEvent>
    9.37      <PostBuildEvent>
    9.38        <Message>Copy SDL</Message>
    9.39      </PostBuildEvent>
    9.40    </ItemDefinitionGroup>
    9.41    <ItemGroup>
    9.42 -    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
    9.43 -    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
    9.44 +    <Library Include="..\..\SDL\$(Platform)\$(Configuration)\SDL2.lib" />
    9.45 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDL2main.lib" />
    9.46    </ItemGroup>
    9.47    <ItemGroup>
    9.48      <ClCompile Include="..\..\..\test\testgamecontroller.c" />
    10.1 --- a/VisualC/tests/testgl2/testgl2_VS2012.vcxproj	Thu May 30 22:14:24 2013 -0400
    10.2 +++ b/VisualC/tests/testgl2/testgl2_VS2012.vcxproj	Thu May 30 20:03:56 2013 -0700
    10.3 @@ -110,7 +110,7 @@
    10.4        <SubSystem>Windows</SubSystem>
    10.5      </Link>
    10.6      <PostBuildEvent>
    10.7 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
    10.8 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
    10.9      </PostBuildEvent>
   10.10      <PostBuildEvent>
   10.11        <Message>Copy SDL</Message>
   10.12 @@ -145,7 +145,7 @@
   10.13        <SubSystem>Windows</SubSystem>
   10.14      </Link>
   10.15      <PostBuildEvent>
   10.16 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
   10.17 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
   10.18      </PostBuildEvent>
   10.19      <PostBuildEvent>
   10.20        <Message>Copy SDL</Message>
   10.21 @@ -181,7 +181,7 @@
   10.22        <SubSystem>Windows</SubSystem>
   10.23      </Link>
   10.24      <PostBuildEvent>
   10.25 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
   10.26 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
   10.27      </PostBuildEvent>
   10.28      <PostBuildEvent>
   10.29        <Message>Copy SDL</Message>
   10.30 @@ -216,7 +216,7 @@
   10.31        <SubSystem>Windows</SubSystem>
   10.32      </Link>
   10.33      <PostBuildEvent>
   10.34 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
   10.35 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
   10.36      </PostBuildEvent>
   10.37      <PostBuildEvent>
   10.38        <Message>Copy SDL</Message>
   10.39 @@ -226,9 +226,9 @@
   10.40      <ClCompile Include="..\..\..\test\testgl2.c" />
   10.41    </ItemGroup>
   10.42    <ItemGroup>
   10.43 -    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
   10.44 -    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
   10.45 -    <Library Include="..\..\SDLtest\$(Platform)\$(Configuration)\SDLtest.lib" />
   10.46 +    <Library Include="..\..\SDL\$(Platform)\$(Configuration)\SDL2.lib" />
   10.47 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDL2main.lib" />
   10.48 +    <Library Include="..\..\SDLtest\$(Platform)\$(Configuration)\SDL2test.lib" />
   10.49    </ItemGroup>
   10.50    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   10.51    <ImportGroup Label="ExtensionTargets">
    11.1 --- a/VisualC/tests/testplatform/testplatform_VS2012.vcxproj	Thu May 30 22:14:24 2013 -0400
    11.2 +++ b/VisualC/tests/testplatform/testplatform_VS2012.vcxproj	Thu May 30 20:03:56 2013 -0700
    11.3 @@ -110,7 +110,7 @@
    11.4        <SuppressStartupBanner>true</SuppressStartupBanner>
    11.5      </Bscmake>
    11.6      <PostBuildEvent>
    11.7 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
    11.8 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
    11.9      </PostBuildEvent>
   11.10      <PostBuildEvent>
   11.11        <Message>Copy SDL</Message>
   11.12 @@ -144,7 +144,7 @@
   11.13        <SuppressStartupBanner>true</SuppressStartupBanner>
   11.14      </Bscmake>
   11.15      <PostBuildEvent>
   11.16 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
   11.17 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
   11.18      </PostBuildEvent>
   11.19      <PostBuildEvent>
   11.20        <Message>Copy SDL</Message>
   11.21 @@ -186,7 +186,7 @@
   11.22        <SuppressStartupBanner>true</SuppressStartupBanner>
   11.23      </Bscmake>
   11.24      <PostBuildEvent>
   11.25 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
   11.26 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
   11.27      </PostBuildEvent>
   11.28      <PostBuildEvent>
   11.29        <Message>Copy SDL</Message>
   11.30 @@ -221,15 +221,15 @@
   11.31        <SuppressStartupBanner>true</SuppressStartupBanner>
   11.32      </Bscmake>
   11.33      <PostBuildEvent>
   11.34 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
   11.35 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
   11.36      </PostBuildEvent>
   11.37      <PostBuildEvent>
   11.38        <Message>Copy SDL</Message>
   11.39      </PostBuildEvent>
   11.40    </ItemDefinitionGroup>
   11.41    <ItemGroup>
   11.42 -    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
   11.43 -    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
   11.44 +    <Library Include="..\..\SDL\$(Platform)\$(Configuration)\SDL2.lib" />
   11.45 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDL2main.lib" />
   11.46    </ItemGroup>
   11.47    <ItemGroup>
   11.48      <ClCompile Include="..\..\..\Test\testplatform.c">
    12.1 --- a/VisualC/tests/testpower/testpower_VS2012.vcxproj	Thu May 30 22:14:24 2013 -0400
    12.2 +++ b/VisualC/tests/testpower/testpower_VS2012.vcxproj	Thu May 30 20:03:56 2013 -0700
    12.3 @@ -109,7 +109,7 @@
    12.4        <SubSystem>Windows</SubSystem>
    12.5      </Link>
    12.6      <PostBuildEvent>
    12.7 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
    12.8 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
    12.9      </PostBuildEvent>
   12.10      <PostBuildEvent>
   12.11        <Message>Copy SDL</Message>
   12.12 @@ -143,7 +143,7 @@
   12.13        <SubSystem>Windows</SubSystem>
   12.14      </Link>
   12.15      <PostBuildEvent>
   12.16 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
   12.17 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
   12.18      </PostBuildEvent>
   12.19      <PostBuildEvent>
   12.20        <Message>Copy SDL</Message>
   12.21 @@ -178,7 +178,7 @@
   12.22        <SubSystem>Windows</SubSystem>
   12.23      </Link>
   12.24      <PostBuildEvent>
   12.25 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
   12.26 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
   12.27      </PostBuildEvent>
   12.28      <PostBuildEvent>
   12.29        <Message>Copy SDL</Message>
   12.30 @@ -212,15 +212,15 @@
   12.31        <SubSystem>Windows</SubSystem>
   12.32      </Link>
   12.33      <PostBuildEvent>
   12.34 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
   12.35 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
   12.36      </PostBuildEvent>
   12.37      <PostBuildEvent>
   12.38        <Message>Copy SDL</Message>
   12.39      </PostBuildEvent>
   12.40    </ItemDefinitionGroup>
   12.41    <ItemGroup>
   12.42 -    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
   12.43 -    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
   12.44 +    <Library Include="..\..\SDL\$(Platform)\$(Configuration)\SDL2.lib" />
   12.45 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDL2main.lib" />
   12.46    </ItemGroup>
   12.47    <ItemGroup>
   12.48      <ClCompile Include="..\..\..\test\testpower.c" />
    13.1 --- a/VisualC/tests/testshape/testshape_VS2012.vcxproj	Thu May 30 22:14:24 2013 -0400
    13.2 +++ b/VisualC/tests/testshape/testshape_VS2012.vcxproj	Thu May 30 20:03:56 2013 -0700
    13.3 @@ -109,7 +109,7 @@
    13.4        <SubSystem>Windows</SubSystem>
    13.5      </Link>
    13.6      <PostBuildEvent>
    13.7 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
    13.8 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
    13.9      </PostBuildEvent>
   13.10      <PostBuildEvent>
   13.11        <Message>Copy SDL</Message>
   13.12 @@ -143,7 +143,7 @@
   13.13        <SubSystem>Windows</SubSystem>
   13.14      </Link>
   13.15      <PostBuildEvent>
   13.16 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
   13.17 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
   13.18      </PostBuildEvent>
   13.19      <PostBuildEvent>
   13.20        <Message>Copy SDL</Message>
   13.21 @@ -178,7 +178,7 @@
   13.22        <SubSystem>Windows</SubSystem>
   13.23      </Link>
   13.24      <PostBuildEvent>
   13.25 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
   13.26 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
   13.27      </PostBuildEvent>
   13.28      <PostBuildEvent>
   13.29        <Message>Copy SDL</Message>
   13.30 @@ -212,15 +212,15 @@
   13.31        <SubSystem>Windows</SubSystem>
   13.32      </Link>
   13.33      <PostBuildEvent>
   13.34 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"</Command>
   13.35 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
   13.36      </PostBuildEvent>
   13.37      <PostBuildEvent>
   13.38        <Message>Copy SDL</Message>
   13.39      </PostBuildEvent>
   13.40    </ItemDefinitionGroup>
   13.41    <ItemGroup>
   13.42 -    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
   13.43 -    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
   13.44 +    <Library Include="..\..\SDL\$(Platform)\$(Configuration)\SDL2.lib" />
   13.45 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDL2main.lib" />
   13.46    </ItemGroup>
   13.47    <ItemGroup>
   13.48      <ClCompile Include="..\..\..\test\testshape.c" />
    14.1 --- a/VisualC/tests/testsprite2/testsprite2_VS2012.vcxproj	Thu May 30 22:14:24 2013 -0400
    14.2 +++ b/VisualC/tests/testsprite2/testsprite2_VS2012.vcxproj	Thu May 30 20:03:56 2013 -0700
    14.3 @@ -109,7 +109,7 @@
    14.4        <SubSystem>Windows</SubSystem>
    14.5      </Link>
    14.6      <PostBuildEvent>
    14.7 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
    14.8 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
    14.9  copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"</Command>
   14.10      </PostBuildEvent>
   14.11      <PostBuildEvent>
   14.12 @@ -144,7 +144,7 @@
   14.13        <SubSystem>Windows</SubSystem>
   14.14      </Link>
   14.15      <PostBuildEvent>
   14.16 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
   14.17 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
   14.18  copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"</Command>
   14.19      </PostBuildEvent>
   14.20      <PostBuildEvent>
   14.21 @@ -180,7 +180,7 @@
   14.22        <SubSystem>Windows</SubSystem>
   14.23      </Link>
   14.24      <PostBuildEvent>
   14.25 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
   14.26 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
   14.27  copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"</Command>
   14.28      </PostBuildEvent>
   14.29      <PostBuildEvent>
   14.30 @@ -215,7 +215,7 @@
   14.31        <SubSystem>Windows</SubSystem>
   14.32      </Link>
   14.33      <PostBuildEvent>
   14.34 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll"
   14.35 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
   14.36  copy "$(SolutionDir)\..\test\icon.bmp" "$(TargetDir)\icon.bmp"</Command>
   14.37      </PostBuildEvent>
   14.38      <PostBuildEvent>
   14.39 @@ -226,9 +226,9 @@
   14.40      <ClCompile Include="..\..\..\test\testsprite2.c" />
   14.41    </ItemGroup>
   14.42    <ItemGroup>
   14.43 -    <Library Include="..\..\Sdl\$(Platform)\$(Configuration)\SDL.lib" />
   14.44 -    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDLmain.lib" />
   14.45 -    <Library Include="..\..\SDLtest\$(Platform)\$(Configuration)\SDLtest.lib" />
   14.46 +    <Library Include="..\..\SDL\$(Platform)\$(Configuration)\SDL2.lib" />
   14.47 +    <Library Include="..\..\SDLmain\$(Platform)\$(Configuration)\SDL2main.lib" />
   14.48 +    <Library Include="..\..\SDLtest\$(Platform)\$(Configuration)\SDL2test.lib" />
   14.49    </ItemGroup>
   14.50    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   14.51    <ImportGroup Label="ExtensionTargets">
    15.1 --- a/VisualC/tests/testvidinfo/testvidinfo_VS2010.vcxproj	Thu May 30 22:14:24 2013 -0400
    15.2 +++ b/VisualC/tests/testvidinfo/testvidinfo_VS2010.vcxproj	Thu May 30 20:03:56 2013 -0700
    15.3 @@ -139,7 +139,7 @@
    15.4        <SubSystem>Windows</SubSystem>
    15.5      </Link>
    15.6      <PostBuildEvent>
    15.7 -      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL.dl"l</Command>
    15.8 +      <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
    15.9      </PostBuildEvent>
   15.10      <PostBuildEvent>
   15.11        <Message>Copy SDL</Message>
    16.1 --- a/src/test/SDL_test_common.c	Thu May 30 22:14:24 2013 -0400
    16.2 +++ b/src/test/SDL_test_common.c	Thu May 30 20:03:56 2013 -0700
    16.3 @@ -325,7 +325,7 @@
    16.4          if (!argv[index]) {
    16.5              return -1;
    16.6          }
    16.7 -        state->scale = SDL_atof(argv[index]);
    16.8 +        state->scale = (float)SDL_atof(argv[index]);
    16.9          return 2;
   16.10      }
   16.11      if (SDL_strcasecmp(argv[index], "--depth") == 0) {
   16.12 @@ -1262,7 +1262,7 @@
   16.13                  /* Ctrl-G toggle grab */
   16.14                  SDL_Window *window = SDL_GetWindowFromID(event->key.windowID);
   16.15                  if (window) {
   16.16 -                    SDL_SetWindowGrab(window, !SDL_GetWindowGrab(window));
   16.17 +                    SDL_SetWindowGrab(window, !SDL_GetWindowGrab(window) ? SDL_TRUE : SDL_FALSE);
   16.18                  }
   16.19              }
   16.20              break;
   16.21 @@ -1283,7 +1283,7 @@
   16.22          case SDLK_r:
   16.23              if (event->key.keysym.mod & KMOD_CTRL) {
   16.24                  /* Ctrl-R toggle mouse relative mode */
   16.25 -                SDL_SetRelativeMouseMode(!SDL_GetRelativeMouseMode());
   16.26 +                SDL_SetRelativeMouseMode(!SDL_GetRelativeMouseMode() ? SDL_TRUE : SDL_FALSE);
   16.27              }
   16.28              break;
   16.29          case SDLK_z:
   16.30 @@ -1315,7 +1315,7 @@
   16.31                  SDL_Window *window = SDL_GetWindowFromID(event->key.windowID);
   16.32                  if (window) {
   16.33                      const Uint32 flags = SDL_GetWindowFlags(window);
   16.34 -                    const SDL_bool b = ((flags & SDL_WINDOW_BORDERLESS) != 0);
   16.35 +                    const SDL_bool b = ((flags & SDL_WINDOW_BORDERLESS) != 0) ? SDL_TRUE : SDL_FALSE;
   16.36                      SDL_SetWindowBordered(window, b);
   16.37                  }
   16.38              }