diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:27:26 -0700 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:27:26 -0700 |
commit | 7751bd4c715ea8478113e34b49b5a794a4642e8e (patch) | |
tree | 537ba82b3780f933c2f17028febd6fe3a2332190 /contrib/vstudio/vc8/testzlib.vcproj | |
parent | e0ff940e1adb68d3575705ebf1546d9f07ad3b4a (diff) | |
download | zlib-1.2.3.9.tar.gz zlib-1.2.3.9.tar.bz2 zlib-1.2.3.9.zip |
zlib 1.2.3.9v1.2.3.9
Diffstat (limited to '')
-rw-r--r-- | contrib/vstudio/vc9/testzlib.vcproj (renamed from contrib/vstudio/vc8/testzlib.vcproj) | 190 |
1 files changed, 94 insertions, 96 deletions
diff --git a/contrib/vstudio/vc8/testzlib.vcproj b/contrib/vstudio/vc9/testzlib.vcproj index 68c3539..9ad07ae 100644 --- a/contrib/vstudio/vc8/testzlib.vcproj +++ b/contrib/vstudio/vc9/testzlib.vcproj | |||
@@ -1,11 +1,12 @@ | |||
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 | Version="8,00" | 4 | Version="9.00" |
5 | Name="testzlib" | 5 | Name="testzlib" |
6 | ProjectGUID="{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}" | 6 | ProjectGUID="{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}" |
7 | RootNamespace="testzlib" | 7 | RootNamespace="testzlib" |
8 | Keyword="Win32Proj" | 8 | Keyword="Win32Proj" |
9 | TargetFrameworkVersion="131072" | ||
9 | > | 10 | > |
10 | <Platforms> | 11 | <Platforms> |
11 | <Platform | 12 | <Platform |
@@ -47,7 +48,7 @@ | |||
47 | Name="VCCLCompilerTool" | 48 | Name="VCCLCompilerTool" |
48 | Optimization="0" | 49 | Optimization="0" |
49 | AdditionalIncludeDirectories="..\..\.." | 50 | AdditionalIncludeDirectories="..\..\.." |
50 | PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" | 51 | PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
51 | MinimalRebuild="true" | 52 | MinimalRebuild="true" |
52 | BasicRuntimeChecks="0" | 53 | BasicRuntimeChecks="0" |
53 | RuntimeLibrary="1" | 54 | RuntimeLibrary="1" |
@@ -77,6 +78,8 @@ | |||
77 | GenerateDebugInformation="true" | 78 | GenerateDebugInformation="true" |
78 | ProgramDatabaseFile="$(OutDir)/testzlib.pdb" | 79 | ProgramDatabaseFile="$(OutDir)/testzlib.pdb" |
79 | SubSystem="1" | 80 | SubSystem="1" |
81 | RandomizedBaseAddress="1" | ||
82 | DataExecutionPrevention="0" | ||
80 | TargetMachine="1" | 83 | TargetMachine="1" |
81 | /> | 84 | /> |
82 | <Tool | 85 | <Tool |
@@ -98,17 +101,16 @@ | |||
98 | Name="VCAppVerifierTool" | 101 | Name="VCAppVerifierTool" |
99 | /> | 102 | /> |
100 | <Tool | 103 | <Tool |
101 | Name="VCWebDeploymentTool" | ||
102 | /> | ||
103 | <Tool | ||
104 | Name="VCPostBuildEventTool" | 104 | Name="VCPostBuildEventTool" |
105 | /> | 105 | /> |
106 | </Configuration> | 106 | </Configuration> |
107 | <Configuration | 107 | <Configuration |
108 | Name="Debug|x64" | 108 | Name="ReleaseWithoutAsm|Win32" |
109 | OutputDirectory="x64\TestZlib$(ConfigurationName)" | 109 | OutputDirectory="x86\TestZlib$(ConfigurationName)" |
110 | IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp" | 110 | IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp" |
111 | ConfigurationType="1" | 111 | ConfigurationType="1" |
112 | CharacterSet="2" | ||
113 | WholeProgramOptimization="1" | ||
112 | > | 114 | > |
113 | <Tool | 115 | <Tool |
114 | Name="VCPreBuildEventTool" | 116 | Name="VCPreBuildEventTool" |
@@ -127,12 +129,21 @@ | |||
127 | /> | 129 | /> |
128 | <Tool | 130 | <Tool |
129 | Name="VCCLCompilerTool" | 131 | Name="VCCLCompilerTool" |
132 | Optimization="2" | ||
133 | InlineFunctionExpansion="1" | ||
134 | OmitFramePointers="true" | ||
130 | AdditionalIncludeDirectories="..\..\.." | 135 | AdditionalIncludeDirectories="..\..\.." |
131 | PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" | 136 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
137 | StringPooling="true" | ||
132 | BasicRuntimeChecks="0" | 138 | BasicRuntimeChecks="0" |
133 | RuntimeLibrary="3" | 139 | RuntimeLibrary="0" |
134 | BufferSecurityCheck="false" | 140 | BufferSecurityCheck="false" |
141 | EnableFunctionLevelLinking="true" | ||
142 | UsePrecompiledHeader="0" | ||
135 | AssemblerListingLocation="$(IntDir)\" | 143 | AssemblerListingLocation="$(IntDir)\" |
144 | WarningLevel="3" | ||
145 | Detect64BitPortabilityProblems="true" | ||
146 | DebugInformationFormat="3" | ||
136 | /> | 147 | /> |
137 | <Tool | 148 | <Tool |
138 | Name="VCManagedResourceCompilerTool" | 149 | Name="VCManagedResourceCompilerTool" |
@@ -145,8 +156,17 @@ | |||
145 | /> | 156 | /> |
146 | <Tool | 157 | <Tool |
147 | Name="VCLinkerTool" | 158 | Name="VCLinkerTool" |
148 | AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj" | 159 | OutputFile="$(OutDir)/testzlib.exe" |
160 | LinkIncremental="1" | ||
149 | GenerateManifest="false" | 161 | GenerateManifest="false" |
162 | GenerateDebugInformation="true" | ||
163 | SubSystem="1" | ||
164 | OptimizeReferences="2" | ||
165 | EnableCOMDATFolding="2" | ||
166 | OptimizeForWindows98="1" | ||
167 | RandomizedBaseAddress="1" | ||
168 | DataExecutionPrevention="0" | ||
169 | TargetMachine="1" | ||
150 | /> | 170 | /> |
151 | <Tool | 171 | <Tool |
152 | Name="VCALinkTool" | 172 | Name="VCALinkTool" |
@@ -167,18 +187,16 @@ | |||
167 | Name="VCAppVerifierTool" | 187 | Name="VCAppVerifierTool" |
168 | /> | 188 | /> |
169 | <Tool | 189 | <Tool |
170 | Name="VCWebDeploymentTool" | ||
171 | /> | ||
172 | <Tool | ||
173 | Name="VCPostBuildEventTool" | 190 | Name="VCPostBuildEventTool" |
174 | /> | 191 | /> |
175 | </Configuration> | 192 | </Configuration> |
176 | <Configuration | 193 | <Configuration |
177 | Name="Debug|Itanium" | 194 | Name="Release|Win32" |
178 | OutputDirectory="ia64\TestZlib$(ConfigurationName)" | 195 | OutputDirectory="x86\TestZlib$(ConfigurationName)" |
179 | IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp" | 196 | IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp" |
180 | ConfigurationType="1" | 197 | ConfigurationType="1" |
181 | CharacterSet="2" | 198 | CharacterSet="2" |
199 | WholeProgramOptimization="1" | ||
182 | > | 200 | > |
183 | <Tool | 201 | <Tool |
184 | Name="VCPreBuildEventTool" | 202 | Name="VCPreBuildEventTool" |
@@ -194,19 +212,20 @@ | |||
194 | /> | 212 | /> |
195 | <Tool | 213 | <Tool |
196 | Name="VCMIDLTool" | 214 | Name="VCMIDLTool" |
197 | TargetEnvironment="2" | ||
198 | /> | 215 | /> |
199 | <Tool | 216 | <Tool |
200 | Name="VCCLCompilerTool" | 217 | Name="VCCLCompilerTool" |
201 | Optimization="0" | 218 | Optimization="2" |
219 | InlineFunctionExpansion="1" | ||
220 | OmitFramePointers="true" | ||
202 | AdditionalIncludeDirectories="..\..\.." | 221 | AdditionalIncludeDirectories="..\..\.." |
203 | PreprocessorDefinitions="ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" | 222 | PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
204 | MinimalRebuild="true" | 223 | StringPooling="true" |
205 | BasicRuntimeChecks="0" | 224 | BasicRuntimeChecks="0" |
206 | RuntimeLibrary="3" | 225 | RuntimeLibrary="0" |
207 | BufferSecurityCheck="false" | 226 | BufferSecurityCheck="false" |
227 | EnableFunctionLevelLinking="true" | ||
208 | UsePrecompiledHeader="0" | 228 | UsePrecompiledHeader="0" |
209 | AssemblerOutput="4" | ||
210 | AssemblerListingLocation="$(IntDir)\" | 229 | AssemblerListingLocation="$(IntDir)\" |
211 | WarningLevel="3" | 230 | WarningLevel="3" |
212 | Detect64BitPortabilityProblems="true" | 231 | Detect64BitPortabilityProblems="true" |
@@ -223,13 +242,18 @@ | |||
223 | /> | 242 | /> |
224 | <Tool | 243 | <Tool |
225 | Name="VCLinkerTool" | 244 | Name="VCLinkerTool" |
245 | AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj" | ||
226 | OutputFile="$(OutDir)/testzlib.exe" | 246 | OutputFile="$(OutDir)/testzlib.exe" |
227 | LinkIncremental="2" | 247 | LinkIncremental="1" |
228 | GenerateManifest="false" | 248 | GenerateManifest="false" |
229 | GenerateDebugInformation="true" | 249 | GenerateDebugInformation="true" |
230 | ProgramDatabaseFile="$(OutDir)/testzlib.pdb" | ||
231 | SubSystem="1" | 250 | SubSystem="1" |
232 | TargetMachine="5" | 251 | OptimizeReferences="2" |
252 | EnableCOMDATFolding="2" | ||
253 | OptimizeForWindows98="1" | ||
254 | RandomizedBaseAddress="1" | ||
255 | DataExecutionPrevention="0" | ||
256 | TargetMachine="1" | ||
233 | /> | 257 | /> |
234 | <Tool | 258 | <Tool |
235 | Name="VCALinkTool" | 259 | Name="VCALinkTool" |
@@ -250,19 +274,14 @@ | |||
250 | Name="VCAppVerifierTool" | 274 | Name="VCAppVerifierTool" |
251 | /> | 275 | /> |
252 | <Tool | 276 | <Tool |
253 | Name="VCWebDeploymentTool" | ||
254 | /> | ||
255 | <Tool | ||
256 | Name="VCPostBuildEventTool" | 277 | Name="VCPostBuildEventTool" |
257 | /> | 278 | /> |
258 | </Configuration> | 279 | </Configuration> |
259 | <Configuration | 280 | <Configuration |
260 | Name="ReleaseWithoutAsm|Win32" | 281 | Name="Debug|x64" |
261 | OutputDirectory="x86\TestZlib$(ConfigurationName)" | 282 | OutputDirectory="x64\TestZlib$(ConfigurationName)" |
262 | IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp" | 283 | IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp" |
263 | ConfigurationType="1" | 284 | ConfigurationType="1" |
264 | CharacterSet="2" | ||
265 | WholeProgramOptimization="1" | ||
266 | > | 285 | > |
267 | <Tool | 286 | <Tool |
268 | Name="VCPreBuildEventTool" | 287 | Name="VCPreBuildEventTool" |
@@ -281,21 +300,12 @@ | |||
281 | /> | 300 | /> |
282 | <Tool | 301 | <Tool |
283 | Name="VCCLCompilerTool" | 302 | Name="VCCLCompilerTool" |
284 | Optimization="2" | ||
285 | InlineFunctionExpansion="1" | ||
286 | OmitFramePointers="true" | ||
287 | AdditionalIncludeDirectories="..\..\.." | 303 | AdditionalIncludeDirectories="..\..\.." |
288 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" | 304 | PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
289 | StringPooling="true" | ||
290 | BasicRuntimeChecks="0" | 305 | BasicRuntimeChecks="0" |
291 | RuntimeLibrary="0" | 306 | RuntimeLibrary="3" |
292 | BufferSecurityCheck="false" | 307 | BufferSecurityCheck="false" |
293 | EnableFunctionLevelLinking="true" | ||
294 | UsePrecompiledHeader="0" | ||
295 | AssemblerListingLocation="$(IntDir)\" | 308 | AssemblerListingLocation="$(IntDir)\" |
296 | WarningLevel="3" | ||
297 | Detect64BitPortabilityProblems="true" | ||
298 | DebugInformationFormat="3" | ||
299 | /> | 309 | /> |
300 | <Tool | 310 | <Tool |
301 | Name="VCManagedResourceCompilerTool" | 311 | Name="VCManagedResourceCompilerTool" |
@@ -308,15 +318,8 @@ | |||
308 | /> | 318 | /> |
309 | <Tool | 319 | <Tool |
310 | Name="VCLinkerTool" | 320 | Name="VCLinkerTool" |
311 | OutputFile="$(OutDir)/testzlib.exe" | 321 | AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj" |
312 | LinkIncremental="1" | ||
313 | GenerateManifest="false" | 322 | GenerateManifest="false" |
314 | GenerateDebugInformation="true" | ||
315 | SubSystem="1" | ||
316 | OptimizeReferences="2" | ||
317 | EnableCOMDATFolding="2" | ||
318 | OptimizeForWindows98="1" | ||
319 | TargetMachine="1" | ||
320 | /> | 323 | /> |
321 | <Tool | 324 | <Tool |
322 | Name="VCALinkTool" | 325 | Name="VCALinkTool" |
@@ -344,11 +347,11 @@ | |||
344 | /> | 347 | /> |
345 | </Configuration> | 348 | </Configuration> |
346 | <Configuration | 349 | <Configuration |
347 | Name="ReleaseWithoutAsm|x64" | 350 | Name="Debug|Itanium" |
348 | OutputDirectory="x64\TestZlib$(ConfigurationName)" | 351 | OutputDirectory="ia64\TestZlib$(ConfigurationName)" |
349 | IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp" | 352 | IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp" |
350 | ConfigurationType="1" | 353 | ConfigurationType="1" |
351 | WholeProgramOptimization="1" | 354 | CharacterSet="2" |
352 | > | 355 | > |
353 | <Tool | 356 | <Tool |
354 | Name="VCPreBuildEventTool" | 357 | Name="VCPreBuildEventTool" |
@@ -364,15 +367,23 @@ | |||
364 | /> | 367 | /> |
365 | <Tool | 368 | <Tool |
366 | Name="VCMIDLTool" | 369 | Name="VCMIDLTool" |
370 | TargetEnvironment="2" | ||
367 | /> | 371 | /> |
368 | <Tool | 372 | <Tool |
369 | Name="VCCLCompilerTool" | 373 | Name="VCCLCompilerTool" |
374 | Optimization="0" | ||
370 | AdditionalIncludeDirectories="..\..\.." | 375 | AdditionalIncludeDirectories="..\..\.." |
371 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" | 376 | PreprocessorDefinitions="ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" |
377 | MinimalRebuild="true" | ||
372 | BasicRuntimeChecks="0" | 378 | BasicRuntimeChecks="0" |
373 | RuntimeLibrary="2" | 379 | RuntimeLibrary="3" |
374 | BufferSecurityCheck="false" | 380 | BufferSecurityCheck="false" |
381 | UsePrecompiledHeader="0" | ||
382 | AssemblerOutput="4" | ||
375 | AssemblerListingLocation="$(IntDir)\" | 383 | AssemblerListingLocation="$(IntDir)\" |
384 | WarningLevel="3" | ||
385 | Detect64BitPortabilityProblems="true" | ||
386 | DebugInformationFormat="3" | ||
376 | /> | 387 | /> |
377 | <Tool | 388 | <Tool |
378 | Name="VCManagedResourceCompilerTool" | 389 | Name="VCManagedResourceCompilerTool" |
@@ -385,8 +396,13 @@ | |||
385 | /> | 396 | /> |
386 | <Tool | 397 | <Tool |
387 | Name="VCLinkerTool" | 398 | Name="VCLinkerTool" |
388 | AdditionalDependencies="" | 399 | OutputFile="$(OutDir)/testzlib.exe" |
400 | LinkIncremental="2" | ||
389 | GenerateManifest="false" | 401 | GenerateManifest="false" |
402 | GenerateDebugInformation="true" | ||
403 | ProgramDatabaseFile="$(OutDir)/testzlib.pdb" | ||
404 | SubSystem="1" | ||
405 | TargetMachine="5" | ||
390 | /> | 406 | /> |
391 | <Tool | 407 | <Tool |
392 | Name="VCALinkTool" | 408 | Name="VCALinkTool" |
@@ -414,11 +430,10 @@ | |||
414 | /> | 430 | /> |
415 | </Configuration> | 431 | </Configuration> |
416 | <Configuration | 432 | <Configuration |
417 | Name="ReleaseWithoutAsm|Itanium" | 433 | Name="ReleaseWithoutAsm|x64" |
418 | OutputDirectory="ia64\TestZlib$(ConfigurationName)" | 434 | OutputDirectory="x64\TestZlib$(ConfigurationName)" |
419 | IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp" | 435 | IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp" |
420 | ConfigurationType="1" | 436 | ConfigurationType="1" |
421 | CharacterSet="2" | ||
422 | WholeProgramOptimization="1" | 437 | WholeProgramOptimization="1" |
423 | > | 438 | > |
424 | <Tool | 439 | <Tool |
@@ -435,25 +450,15 @@ | |||
435 | /> | 450 | /> |
436 | <Tool | 451 | <Tool |
437 | Name="VCMIDLTool" | 452 | Name="VCMIDLTool" |
438 | TargetEnvironment="2" | ||
439 | /> | 453 | /> |
440 | <Tool | 454 | <Tool |
441 | Name="VCCLCompilerTool" | 455 | Name="VCCLCompilerTool" |
442 | Optimization="2" | ||
443 | InlineFunctionExpansion="1" | ||
444 | OmitFramePointers="true" | ||
445 | AdditionalIncludeDirectories="..\..\.." | 456 | AdditionalIncludeDirectories="..\..\.." |
446 | PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" | 457 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
447 | StringPooling="true" | ||
448 | BasicRuntimeChecks="0" | 458 | BasicRuntimeChecks="0" |
449 | RuntimeLibrary="2" | 459 | RuntimeLibrary="2" |
450 | BufferSecurityCheck="false" | 460 | BufferSecurityCheck="false" |
451 | EnableFunctionLevelLinking="true" | ||
452 | UsePrecompiledHeader="0" | ||
453 | AssemblerListingLocation="$(IntDir)\" | 461 | AssemblerListingLocation="$(IntDir)\" |
454 | WarningLevel="3" | ||
455 | Detect64BitPortabilityProblems="true" | ||
456 | DebugInformationFormat="3" | ||
457 | /> | 462 | /> |
458 | <Tool | 463 | <Tool |
459 | Name="VCManagedResourceCompilerTool" | 464 | Name="VCManagedResourceCompilerTool" |
@@ -466,15 +471,8 @@ | |||
466 | /> | 471 | /> |
467 | <Tool | 472 | <Tool |
468 | Name="VCLinkerTool" | 473 | Name="VCLinkerTool" |
469 | OutputFile="$(OutDir)/testzlib.exe" | 474 | AdditionalDependencies="" |
470 | LinkIncremental="1" | ||
471 | GenerateManifest="false" | 475 | GenerateManifest="false" |
472 | GenerateDebugInformation="true" | ||
473 | SubSystem="1" | ||
474 | OptimizeReferences="2" | ||
475 | EnableCOMDATFolding="2" | ||
476 | OptimizeForWindows98="1" | ||
477 | TargetMachine="5" | ||
478 | /> | 476 | /> |
479 | <Tool | 477 | <Tool |
480 | Name="VCALinkTool" | 478 | Name="VCALinkTool" |
@@ -502,9 +500,9 @@ | |||
502 | /> | 500 | /> |
503 | </Configuration> | 501 | </Configuration> |
504 | <Configuration | 502 | <Configuration |
505 | Name="Release|Win32" | 503 | Name="ReleaseWithoutAsm|Itanium" |
506 | OutputDirectory="x86\TestZlib$(ConfigurationName)" | 504 | OutputDirectory="ia64\TestZlib$(ConfigurationName)" |
507 | IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp" | 505 | IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp" |
508 | ConfigurationType="1" | 506 | ConfigurationType="1" |
509 | CharacterSet="2" | 507 | CharacterSet="2" |
510 | WholeProgramOptimization="1" | 508 | WholeProgramOptimization="1" |
@@ -523,6 +521,7 @@ | |||
523 | /> | 521 | /> |
524 | <Tool | 522 | <Tool |
525 | Name="VCMIDLTool" | 523 | Name="VCMIDLTool" |
524 | TargetEnvironment="2" | ||
526 | /> | 525 | /> |
527 | <Tool | 526 | <Tool |
528 | Name="VCCLCompilerTool" | 527 | Name="VCCLCompilerTool" |
@@ -530,10 +529,10 @@ | |||
530 | InlineFunctionExpansion="1" | 529 | InlineFunctionExpansion="1" |
531 | OmitFramePointers="true" | 530 | OmitFramePointers="true" |
532 | AdditionalIncludeDirectories="..\..\.." | 531 | AdditionalIncludeDirectories="..\..\.." |
533 | PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" | 532 | PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" |
534 | StringPooling="true" | 533 | StringPooling="true" |
535 | BasicRuntimeChecks="0" | 534 | BasicRuntimeChecks="0" |
536 | RuntimeLibrary="0" | 535 | RuntimeLibrary="2" |
537 | BufferSecurityCheck="false" | 536 | BufferSecurityCheck="false" |
538 | EnableFunctionLevelLinking="true" | 537 | EnableFunctionLevelLinking="true" |
539 | UsePrecompiledHeader="0" | 538 | UsePrecompiledHeader="0" |
@@ -553,7 +552,6 @@ | |||
553 | /> | 552 | /> |
554 | <Tool | 553 | <Tool |
555 | Name="VCLinkerTool" | 554 | Name="VCLinkerTool" |
556 | AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj" | ||
557 | OutputFile="$(OutDir)/testzlib.exe" | 555 | OutputFile="$(OutDir)/testzlib.exe" |
558 | LinkIncremental="1" | 556 | LinkIncremental="1" |
559 | GenerateManifest="false" | 557 | GenerateManifest="false" |
@@ -562,7 +560,7 @@ | |||
562 | OptimizeReferences="2" | 560 | OptimizeReferences="2" |
563 | EnableCOMDATFolding="2" | 561 | EnableCOMDATFolding="2" |
564 | OptimizeForWindows98="1" | 562 | OptimizeForWindows98="1" |
565 | TargetMachine="1" | 563 | TargetMachine="5" |
566 | /> | 564 | /> |
567 | <Tool | 565 | <Tool |
568 | Name="VCALinkTool" | 566 | Name="VCALinkTool" |
@@ -614,7 +612,7 @@ | |||
614 | <Tool | 612 | <Tool |
615 | Name="VCCLCompilerTool" | 613 | Name="VCCLCompilerTool" |
616 | AdditionalIncludeDirectories="..\..\.." | 614 | AdditionalIncludeDirectories="..\..\.." |
617 | PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" | 615 | PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
618 | BasicRuntimeChecks="0" | 616 | BasicRuntimeChecks="0" |
619 | RuntimeLibrary="2" | 617 | RuntimeLibrary="2" |
620 | BufferSecurityCheck="false" | 618 | BufferSecurityCheck="false" |
@@ -689,7 +687,7 @@ | |||
689 | InlineFunctionExpansion="1" | 687 | InlineFunctionExpansion="1" |
690 | OmitFramePointers="true" | 688 | OmitFramePointers="true" |
691 | AdditionalIncludeDirectories="..\..\.." | 689 | AdditionalIncludeDirectories="..\..\.." |
692 | PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" | 690 | PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" |
693 | StringPooling="true" | 691 | StringPooling="true" |
694 | BasicRuntimeChecks="0" | 692 | BasicRuntimeChecks="0" |
695 | RuntimeLibrary="2" | 693 | RuntimeLibrary="2" |
@@ -863,7 +861,7 @@ | |||
863 | /> | 861 | /> |
864 | </FileConfiguration> | 862 | </FileConfiguration> |
865 | <FileConfiguration | 863 | <FileConfiguration |
866 | Name="Debug|Itanium" | 864 | Name="ReleaseWithoutAsm|Win32" |
867 | ExcludedFromBuild="true" | 865 | ExcludedFromBuild="true" |
868 | > | 866 | > |
869 | <Tool | 867 | <Tool |
@@ -871,7 +869,7 @@ | |||
871 | /> | 869 | /> |
872 | </FileConfiguration> | 870 | </FileConfiguration> |
873 | <FileConfiguration | 871 | <FileConfiguration |
874 | Name="ReleaseWithoutAsm|Win32" | 872 | Name="Release|Win32" |
875 | ExcludedFromBuild="true" | 873 | ExcludedFromBuild="true" |
876 | > | 874 | > |
877 | <Tool | 875 | <Tool |
@@ -879,7 +877,7 @@ | |||
879 | /> | 877 | /> |
880 | </FileConfiguration> | 878 | </FileConfiguration> |
881 | <FileConfiguration | 879 | <FileConfiguration |
882 | Name="ReleaseWithoutAsm|Itanium" | 880 | Name="Debug|Itanium" |
883 | ExcludedFromBuild="true" | 881 | ExcludedFromBuild="true" |
884 | > | 882 | > |
885 | <Tool | 883 | <Tool |
@@ -887,7 +885,7 @@ | |||
887 | /> | 885 | /> |
888 | </FileConfiguration> | 886 | </FileConfiguration> |
889 | <FileConfiguration | 887 | <FileConfiguration |
890 | Name="Release|Win32" | 888 | Name="ReleaseWithoutAsm|Itanium" |
891 | ExcludedFromBuild="true" | 889 | ExcludedFromBuild="true" |
892 | > | 890 | > |
893 | <Tool | 891 | <Tool |