pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reverted SDL_VS2005.vcproj to revision 4634.

Browse source
This commit is contained in:
Jim Grandpre 2010-12-15 21:21:13 -05:00
parent 35cc558917
commit cb98f67b45
1 changed files with 0 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

50
VisualC/SDL/SDL_VS2005.vcproj
View file

@ -1,18 +1,10 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
<<<<<<< local
Version="8.00" Version="8.00"
=======
Version="9.00"
>>>>>>> other
Name="SDL" Name="SDL"
ProjectGUID="{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}" ProjectGUID="{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
RootNamespace="SDL" RootNamespace="SDL"
<<<<<<< local
=======
TargetFrameworkVersion="131072"
>>>>>>> other
> >
<Platforms> <Platforms>
<Platform <Platform
@ -84,36 +76,16 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
<<<<<<< local
AdditionalOptions="/MACHINE:I386" AdditionalOptions="/MACHINE:I386"
=======
AdditionalOptions="/MACHINE:I386&#x0D;&#x0A;msvcrt.lib"
>>>>>>> other
AdditionalDependencies="msimg32.lib winmm.lib" AdditionalDependencies="msimg32.lib winmm.lib"
OutputFile=".\Debug/SDL.dll" OutputFile=".\Debug/SDL.dll"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="true" SuppressStartupBanner="true"
<<<<<<< local
IgnoreAllDefaultLibraries="true" IgnoreAllDefaultLibraries="true"
=======
IgnoreAllDefaultLibraries="false"
IgnoreDefaultLibraryNames=""
>>>>>>> other
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/SDL.pdb" ProgramDatabaseFile=".\Debug/SDL.pdb"
<<<<<<< local
SubSystem="2" SubSystem="2"
=======
SubSystem="0"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
>>>>>>> other
ImportLibrary=".\Debug/SDL.lib" ImportLibrary=".\Debug/SDL.lib"
<<<<<<< local
=======
Profile="true"
CLRThreadAttribute="0"
>>>>>>> other
CLRUnmanagedCodeCheck="false" CLRUnmanagedCodeCheck="false"
/> />
<Tool <Tool
@ -135,12 +107,9 @@
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool <Tool
<<<<<<< local
Name="VCWebDeploymentTool" Name="VCWebDeploymentTool"
/> />
<Tool <Tool
=======
>>>>>>> other
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
@ -216,11 +185,6 @@
IgnoreAllDefaultLibraries="true" IgnoreAllDefaultLibraries="true"
ProgramDatabaseFile=".\Release/SDL.pdb" ProgramDatabaseFile=".\Release/SDL.pdb"
SubSystem="2" SubSystem="2"
<<<<<<< local
=======
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
>>>>>>> other
ImportLibrary=".\Release/SDL.lib" ImportLibrary=".\Release/SDL.lib"
/> />
<Tool <Tool
@ -242,12 +206,9 @@
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool <Tool
<<<<<<< local
Name="VCWebDeploymentTool" Name="VCWebDeploymentTool"
/> />
<Tool <Tool
=======
>>>>>>> other
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
@ -980,17 +941,6 @@
> >
</File> </File>
<File <File
<<<<<<< local
=======
RelativePath="..\..\src\events\SDL_touch.c"
>
</File>
<File
RelativePath="..\..\src\events\SDL_touch_c.h"
>
</File>
<File
>>>>>>> other
RelativePath="..\..\src\video\SDL_video.c" RelativePath="..\..\src\video\SDL_video.c"
> >
</File> </File>