Mercurial > sdl-ios-xcode

comparison VisualC/SDL/SDL_VS2005.vcproj @ 4930:719dbb5afce8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reverted SDL_VS2005.vcproj to revision 4634.
author Jim Grandpre <jim.tla@gmail.com>
date Wed, 15 Dec 2010 21:21:13 -0500
parents 3c4e0130c9b1
children fc718f26c15e
comparison
equal deleted inserted replaced
4929:aa8888658021 4930:719dbb5afce8
1 <?xml version="1.0" encoding="Windows-1252"?> 1 <?xml version="1.0" encoding="Windows-1252"?>
2 <VisualStudioProject 2 <VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 <<<<<<< local
5 Version="8.00" 4 Version="8.00"
6 =======
7 Version="9.00"
8 >>>>>>> other
9 Name="SDL" 5 Name="SDL"
10 ProjectGUID="{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}" 6 ProjectGUID="{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
11 RootNamespace="SDL" 7 RootNamespace="SDL"
12 <<<<<<< local
13 =======
14 TargetFrameworkVersion="131072"
15 >>>>>>> other
16 > 8 >
17 <Platforms> 9 <Platforms>
18 <Platform 10 <Platform
19 Name="Win32" 11 Name="Win32"
20 /> 12 />
82 <Tool 74 <Tool
83 Name="VCPreLinkEventTool" 75 Name="VCPreLinkEventTool"
84 /> 76 />
85 <Tool 77 <Tool
86 Name="VCLinkerTool" 78 Name="VCLinkerTool"
87 <<<<<<< local
88 AdditionalOptions="/MACHINE:I386" 79 AdditionalOptions="/MACHINE:I386"
89 =======
90 AdditionalOptions="/MACHINE:I386&#x0D;&#x0A;msvcrt.lib"
91 >>>>>>> other
92 AdditionalDependencies="msimg32.lib winmm.lib" 80 AdditionalDependencies="msimg32.lib winmm.lib"
93 OutputFile=".\Debug/SDL.dll" 81 OutputFile=".\Debug/SDL.dll"
94 LinkIncremental="2" 82 LinkIncremental="2"
95 SuppressStartupBanner="true" 83 SuppressStartupBanner="true"
96 <<<<<<< local
97 IgnoreAllDefaultLibraries="true" 84 IgnoreAllDefaultLibraries="true"
98 =======
99 IgnoreAllDefaultLibraries="false"
100 IgnoreDefaultLibraryNames=""
101 >>>>>>> other
102 GenerateDebugInformation="true" 85 GenerateDebugInformation="true"
103 ProgramDatabaseFile=".\Debug/SDL.pdb" 86 ProgramDatabaseFile=".\Debug/SDL.pdb"
104 <<<<<<< local
105 SubSystem="2" 87 SubSystem="2"
106 =======
107 SubSystem="0"
108 RandomizedBaseAddress="1"
109 DataExecutionPrevention="0"
110 >>>>>>> other
111 ImportLibrary=".\Debug/SDL.lib" 88 ImportLibrary=".\Debug/SDL.lib"
112 <<<<<<< local
113 =======
114 Profile="true"
115 CLRThreadAttribute="0"
116 >>>>>>> other
117 CLRUnmanagedCodeCheck="false" 89 CLRUnmanagedCodeCheck="false"
118 /> 90 />
119 <Tool 91 <Tool
120 Name="VCALinkTool" 92 Name="VCALinkTool"
121 /> 93 />
133 /> 105 />
134 <Tool 106 <Tool
135 Name="VCAppVerifierTool" 107 Name="VCAppVerifierTool"
136 /> 108 />
137 <Tool 109 <Tool
138 <<<<<<< local
139 Name="VCWebDeploymentTool" 110 Name="VCWebDeploymentTool"
140 /> 111 />
141 <Tool 112 <Tool
142 =======
143 >>>>>>> other
144 Name="VCPostBuildEventTool" 113 Name="VCPostBuildEventTool"
145 /> 114 />
146 </Configuration> 115 </Configuration>
147 <Configuration 116 <Configuration
148 Name="Release|Win32" 117 Name="Release|Win32"
214 LinkIncremental="1" 183 LinkIncremental="1"
215 SuppressStartupBanner="true" 184 SuppressStartupBanner="true"
216 IgnoreAllDefaultLibraries="true" 185 IgnoreAllDefaultLibraries="true"
217 ProgramDatabaseFile=".\Release/SDL.pdb" 186 ProgramDatabaseFile=".\Release/SDL.pdb"
218 SubSystem="2" 187 SubSystem="2"
219 <<<<<<< local
220 =======
221 RandomizedBaseAddress="1"
222 DataExecutionPrevention="0"
223 >>>>>>> other
224 ImportLibrary=".\Release/SDL.lib" 188 ImportLibrary=".\Release/SDL.lib"
225 /> 189 />
226 <Tool 190 <Tool
227 Name="VCALinkTool" 191 Name="VCALinkTool"
228 /> 192 />
240 /> 204 />
241 <Tool 205 <Tool
242 Name="VCAppVerifierTool" 206 Name="VCAppVerifierTool"
243 /> 207 />
244 <Tool 208 <Tool
245 <<<<<<< local
246 Name="VCWebDeploymentTool" 209 Name="VCWebDeploymentTool"
247 /> 210 />
248 <Tool 211 <Tool
249 =======
250 >>>>>>> other
251 Name="VCPostBuildEventTool" 212 Name="VCPostBuildEventTool"
252 /> 213 />
253 </Configuration> 214 </Configuration>
254 </Configurations> 215 </Configurations>
255 <References> 216 <References>
978 <File 939 <File
979 RelativePath="..\..\src\timer\SDL_timer_c.h" 940 RelativePath="..\..\src\timer\SDL_timer_c.h"
980 > 941 >
981 </File> 942 </File>
982 <File 943 <File
983 <<<<<<< local
984 =======
985 RelativePath="..\..\src\events\SDL_touch.c"
986 >
987 </File>
988 <File
989 RelativePath="..\..\src\events\SDL_touch_c.h"
990 >
991 </File>
992 <File
993 >>>>>>> other
994 RelativePath="..\..\src\video\SDL_video.c" 944 RelativePath="..\..\src\video\SDL_video.c"
995 > 945 >
996 </File> 946 </File>
997 <File 947 <File
998 RelativePath="..\..\src\video\win32\SDL_vkeys.h" 948 RelativePath="..\..\src\video\win32\SDL_vkeys.h"