Mercurial > sdl-ios-xcode

comparison VisualC/SDL/SDL_VS2005.vcproj @ 4662:3c4e0130c9b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS.
author Jim Grandpre <jim.tla@gmail.com>
date Tue, 13 Jul 2010 18:31:09 -0400
parents 03dcb795c583
children 719dbb5afce8
comparison
equal deleted inserted replaced
4661:03dcb795c583 4662:3c4e0130c9b1
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"
6 =======
4 Version="9.00" 7 Version="9.00"
8 >>>>>>> other
5 Name="SDL" 9 Name="SDL"
6 ProjectGUID="{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}" 10 ProjectGUID="{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
7 RootNamespace="SDL" 11 RootNamespace="SDL"
12 <<<<<<< local
13 =======
8 TargetFrameworkVersion="131072" 14 TargetFrameworkVersion="131072"
15 >>>>>>> other
9 > 16 >
10 <Platforms> 17 <Platforms>
11 <Platform 18 <Platform
12 Name="Win32" 19 Name="Win32"
13 /> 20 />
75 <Tool 82 <Tool
76 Name="VCPreLinkEventTool" 83 Name="VCPreLinkEventTool"
77 /> 84 />
78 <Tool 85 <Tool
79 Name="VCLinkerTool" 86 Name="VCLinkerTool"
87 <<<<<<< local
88 AdditionalOptions="/MACHINE:I386"
89 =======
80 AdditionalOptions="/MACHINE:I386&#x0D;&#x0A;msvcrt.lib" 90 AdditionalOptions="/MACHINE:I386&#x0D;&#x0A;msvcrt.lib"
91 >>>>>>> other
81 AdditionalDependencies="msimg32.lib winmm.lib" 92 AdditionalDependencies="msimg32.lib winmm.lib"
82 OutputFile=".\Debug/SDL.dll" 93 OutputFile=".\Debug/SDL.dll"
83 LinkIncremental="2" 94 LinkIncremental="2"
84 SuppressStartupBanner="true" 95 SuppressStartupBanner="true"
96 <<<<<<< local
97 IgnoreAllDefaultLibraries="true"
98 =======
85 IgnoreAllDefaultLibraries="false" 99 IgnoreAllDefaultLibraries="false"
86 IgnoreDefaultLibraryNames="" 100 IgnoreDefaultLibraryNames=""
101 >>>>>>> other
87 GenerateDebugInformation="true" 102 GenerateDebugInformation="true"
88 ProgramDatabaseFile=".\Debug/SDL.pdb" 103 ProgramDatabaseFile=".\Debug/SDL.pdb"
104 <<<<<<< local
105 SubSystem="2"
106 =======
89 SubSystem="0" 107 SubSystem="0"
90 RandomizedBaseAddress="1" 108 RandomizedBaseAddress="1"
91 DataExecutionPrevention="0" 109 DataExecutionPrevention="0"
110 >>>>>>> other
92 ImportLibrary=".\Debug/SDL.lib" 111 ImportLibrary=".\Debug/SDL.lib"
112 <<<<<<< local
113 =======
93 Profile="true" 114 Profile="true"
94 CLRThreadAttribute="0" 115 CLRThreadAttribute="0"
116 >>>>>>> other
95 CLRUnmanagedCodeCheck="false" 117 CLRUnmanagedCodeCheck="false"
96 /> 118 />
97 <Tool 119 <Tool
98 Name="VCALinkTool" 120 Name="VCALinkTool"
99 /> 121 />
111 /> 133 />
112 <Tool 134 <Tool
113 Name="VCAppVerifierTool" 135 Name="VCAppVerifierTool"
114 /> 136 />
115 <Tool 137 <Tool
138 <<<<<<< local
139 Name="VCWebDeploymentTool"
140 />
141 <Tool
142 =======
143 >>>>>>> other
116 Name="VCPostBuildEventTool" 144 Name="VCPostBuildEventTool"
117 /> 145 />
118 </Configuration> 146 </Configuration>
119 <Configuration 147 <Configuration
120 Name="Release|Win32" 148 Name="Release|Win32"
186 LinkIncremental="1" 214 LinkIncremental="1"
187 SuppressStartupBanner="true" 215 SuppressStartupBanner="true"
188 IgnoreAllDefaultLibraries="true" 216 IgnoreAllDefaultLibraries="true"
189 ProgramDatabaseFile=".\Release/SDL.pdb" 217 ProgramDatabaseFile=".\Release/SDL.pdb"
190 SubSystem="2" 218 SubSystem="2"
219 <<<<<<< local
220 =======
191 RandomizedBaseAddress="1" 221 RandomizedBaseAddress="1"
192 DataExecutionPrevention="0" 222 DataExecutionPrevention="0"
223 >>>>>>> other
193 ImportLibrary=".\Release/SDL.lib" 224 ImportLibrary=".\Release/SDL.lib"
194 /> 225 />
195 <Tool 226 <Tool
196 Name="VCALinkTool" 227 Name="VCALinkTool"
197 /> 228 />
209 /> 240 />
210 <Tool 241 <Tool
211 Name="VCAppVerifierTool" 242 Name="VCAppVerifierTool"
212 /> 243 />
213 <Tool 244 <Tool
245 <<<<<<< local
246 Name="VCWebDeploymentTool"
247 />
248 <Tool
249 =======
250 >>>>>>> other
214 Name="VCPostBuildEventTool" 251 Name="VCPostBuildEventTool"
215 /> 252 />
216 </Configuration> 253 </Configuration>
217 </Configurations> 254 </Configurations>
218 <References> 255 <References>
941 <File 978 <File
942 RelativePath="..\..\src\timer\SDL_timer_c.h" 979 RelativePath="..\..\src\timer\SDL_timer_c.h"
943 > 980 >
944 </File> 981 </File>
945 <File 982 <File
983 <<<<<<< local
984 =======
946 RelativePath="..\..\src\events\SDL_touch.c" 985 RelativePath="..\..\src\events\SDL_touch.c"
947 > 986 >
948 </File> 987 </File>
949 <File 988 <File
950 RelativePath="..\..\src\events\SDL_touch_c.h" 989 RelativePath="..\..\src\events\SDL_touch_c.h"
951 > 990 >
952 </File> 991 </File>
953 <File 992 <File
993 >>>>>>> other
954 RelativePath="..\..\src\video\SDL_video.c" 994 RelativePath="..\..\src\video\SDL_video.c"
955 > 995 >
956 </File> 996 </File>
957 <File 997 <File
958 RelativePath="..\..\src\video\win32\SDL_vkeys.h" 998 RelativePath="..\..\src\video\win32\SDL_vkeys.h"