Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Merged changes from default

  • Loading branch information
slouken committed Jul 6, 2010
2 parents 8f7546e + 89f3efb commit d3e1a5bea7a122a4ce6b847d1c6425ef108e2793
Showing with 4,510 additions and 5 deletions.
  1. 0 VisualC/SDL/{SDL.vcproj → SDL_VS2005.vcproj}
  2. +2 −2 VisualC/{SDL.sln → SDL_VS2005.sln}
  3. +321 −1 VisualC/SDL_VS2008.sln
  4. 0 VisualC/SDLmain/{SDLmain.vcproj → SDLmain_VS2005.vcproj}
  5. +4 −0 VisualC/tests/automated/{automated.vcproj → automated_VS2008.vcproj}
  6. 0 VisualC/tests/checkkeys/{checkkeys.vcproj → checkkeys_VS2005.vcproj}
  7. +208 −0 VisualC/tests/checkkeys/checkkeys_VS2008.vcproj
  8. 0 VisualC/tests/graywin/{graywin.vcproj → graywin_VS2005.vcproj}
  9. +208 −0 VisualC/tests/graywin/graywin_VS2008.vcproj
  10. 0 VisualC/tests/loopwave/{loopwave.vcproj → loopwave_VS2005.vcproj}
  11. +208 −0 VisualC/tests/loopwave/loopwave_VS2008.vcproj
  12. 0 VisualC/tests/testalpha/{testalpha.vcproj → testalpha_VS2005.vcproj}
  13. +208 −0 VisualC/tests/testalpha/testalpha_VS2008.vcproj
  14. 0 VisualC/tests/testdraw2/{testdraw2.vcproj → testdraw2_VS2005.vcproj}
  15. +212 −0 VisualC/tests/testdraw2/testdraw2_VS2008.vcproj
  16. 0 VisualC/tests/testfile/{testfile.vcproj → testfile_VS2005.vcproj}
  17. +208 −0 VisualC/tests/testfile/testfile_VS2008.vcproj
  18. 0 VisualC/tests/testgamma/{testgamma.vcproj → testgamma_VS2005.vcproj}
  19. +208 −0 VisualC/tests/testgamma/testgamma_VS2008.vcproj
  20. 0 VisualC/tests/testgl/{testgl.vcproj → testgl_VS2005.vcproj}
  21. +210 −0 VisualC/tests/testgl/testgl_VS2008.vcproj
  22. 0 VisualC/tests/testgl2/{testgl2.vcproj → testgl2_VS2005.vcproj}
  23. +214 −0 VisualC/tests/testgl2/testgl2_VS2008.vcproj
  24. 0 VisualC/tests/testjoystick/{testjoystick.vcproj → testjoystick_VS2005.vcproj}
  25. +208 −0 VisualC/tests/testjoystick/testjoystick_VS2008.vcproj
  26. 0 VisualC/tests/testoverlay/{testoverlay.vcproj → testoverlay_VS2005.vcproj}
  27. +208 −0 VisualC/tests/testoverlay/testoverlay_VS2008.vcproj
  28. 0 VisualC/tests/testoverlay2/{testoverlay2.vcproj → testoverlay2_VS2005.vcproj}
  29. +208 −0 VisualC/tests/testoverlay2/testoverlay2_VS2008.vcproj
  30. 0 VisualC/tests/testpalette/{testpalette.vcproj → testpalette_VS2005.vcproj}
  31. +208 −0 VisualC/tests/testpalette/testpalette_VS2008.vcproj
  32. 0 VisualC/tests/testplatform/{testplatform.vcproj → testplatform_VS2005.vcproj}
  33. +212 −0 VisualC/tests/testplatform/testplatform_VS2008.vcproj
  34. 0 VisualC/tests/testpower/{testpower.vcproj → testpower_VS2005.vcproj}
  35. +209 −0 VisualC/tests/testpower/testpower_VS2008.vcproj
  36. 0 VisualC/tests/testsprite/{testsprite.vcproj → testsprite_VS2005.vcproj}
  37. +208 −0 VisualC/tests/testsprite/testsprite_VS2008.vcproj
  38. 0 VisualC/tests/testsprite2/{testsprite2.vcproj → testsprite2_VS2005.vcproj}
  39. +212 −0 VisualC/tests/testsprite2/testsprite2_VS2008.vcproj
  40. 0 VisualC/tests/testvidinfo/{testvidinfo.vcproj → testvidinfo_VS2005.vcproj}
  41. +208 −0 VisualC/tests/testvidinfo/testvidinfo_VS2008.vcproj
  42. 0 VisualC/tests/testwin/{testwin.vcproj → testwin_VS2005.vcproj}
  43. +208 −0 VisualC/tests/testwin/testwin_VS2008.vcproj
  44. 0 VisualC/tests/testwm/{testwm.vcproj → testwm_VS2005.vcproj}
  45. +208 −0 VisualC/tests/testwm/testwm_VS2008.vcproj
  46. +2 −2 test/automated/testsdl.c
File renamed without changes.
@@ -1,8 +1,8 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual C++ Express 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "SDL\SDL.vcproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "SDL\SDL_VS2005.vcproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "SDLmain\SDLmain.vcproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "SDLmain\SDLmain_VS2005.vcproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

Large diffs are not rendered by default.

File renamed without changes.
@@ -196,6 +196,10 @@
RelativePath="..\..\..\test\automated\rwops\rwops.c"
>
</File>
<File
RelativePath="..\..\..\test\automated\rwops\TestSupportRWops_Generic.c"
>
</File>
<File
RelativePath="..\..\..\test\automated\SDL_at.c"
>
File renamed without changes.
@@ -0,0 +1,208 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="checkkeys"
ProjectGUID="{26828762-C95D-4637-9CB1-7F0979523813}"
TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
TypeLibraryName=".\Debug/checkkeys.tlb"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\include"
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Debug/checkkeys.pch"
AssemblerListingLocation=".\Debug/"
ObjectFile=".\Debug/"
ProgramDataBaseFileName=".\Debug/"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
OutputFile=".\Debug/checkkeys.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/checkkeys.pdb"
SubSystem="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
TypeLibraryName=".\Release/checkkeys.tlb"
/>
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\include"
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Release/checkkeys.pch"
AssemblerListingLocation=".\Release/"
ObjectFile=".\Release/"
ProgramDataBaseFileName=".\Release/"
WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
OutputFile=".\Release/checkkeys.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
ProgramDatabaseFile=".\Release/checkkeys.pdb"
SubSystem="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<File
RelativePath="..\..\..\test\checkkeys.c"
>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
File renamed without changes.

0 comments on commit d3e1a5b

Please sign in to comment.