summaryrefslogtreecommitdiff
path: root/contrib/vstudio/vc8
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--contrib/vstudio/vc10/zlib.rc (renamed from contrib/vstudio/vc8/zlib.rc)0
-rw-r--r--contrib/vstudio/vc8/zlibvc.def22
-rw-r--r--contrib/vstudio/vc8/zlibvc.vcproj1230
-rw-r--r--contrib/vstudio/vc9/miniunz.vcproj (renamed from contrib/vstudio/vc8/miniunz.vcproj)81
-rw-r--r--contrib/vstudio/vc9/minizip.vcproj (renamed from contrib/vstudio/vc8/minizip.vcproj)83
-rw-r--r--contrib/vstudio/vc9/testzlib.vcproj (renamed from contrib/vstudio/vc8/testzlib.vcproj)190
-rw-r--r--contrib/vstudio/vc9/testzlibdll.vcproj (renamed from contrib/vstudio/vc8/testzlibdll.vcproj)82
-rw-r--r--contrib/vstudio/vc9/zlibstat.vcproj (renamed from contrib/vstudio/vc8/zlibstat.vcproj)138
-rw-r--r--contrib/vstudio/vc9/zlibvc.sln (renamed from contrib/vstudio/vc8/zlibvc.sln)4
9 files changed, 311 insertions, 1519 deletions
diff --git a/contrib/vstudio/vc8/zlib.rc b/contrib/vstudio/vc10/zlib.rc
index 72cb8b4..72cb8b4 100644
--- a/contrib/vstudio/vc8/zlib.rc
+++ b/contrib/vstudio/vc10/zlib.rc
diff --git a/contrib/vstudio/vc8/zlibvc.def b/contrib/vstudio/vc8/zlibvc.def
index a40e715..0b6a9e9 100644
--- a/contrib/vstudio/vc8/zlibvc.def
+++ b/contrib/vstudio/vc8/zlibvc.def
@@ -90,3 +90,25 @@ EXPORTS
90 unzGoToFilePos @101 90 unzGoToFilePos @101
91 91
92 fill_win32_filefunc @110 92 fill_win32_filefunc @110
93 fill_win32_filefunc64 @111
94 fill_win32_filefunc64A @112
95 fill_win32_filefunc64W @113
96
97; quick hack by hkuno@microhouse.co.jp
98 unzOpen64 @120
99 unzOpen2_64 @121
100 unzGetGlobalInfo64 @122
101 unzGetCurrentFileInfo64 @124
102 unzGetCurrentFileZStreamPos64 @125
103 unztell64 @126
104 unzGetFilePos64 @127
105 unzGoToFilePos64 @128
106
107 zipOpen64 @130
108 zipOpen2_64 @131
109 zipOpenNewFileInZip64 @132
110 zipOpenNewFileInZip2_64 @133
111 zipOpenNewFileInZip3_64 @134
112 zipOpenNewFileInZip4_64 @135
113 zipCloseFileInZipRaw64 @136
114; end hack
diff --git a/contrib/vstudio/vc8/zlibvc.vcproj b/contrib/vstudio/vc8/zlibvc.vcproj
deleted file mode 100644
index f06273b..0000000
--- a/contrib/vstudio/vc8/zlibvc.vcproj
+++ /dev/null
@@ -1,1230 +0,0 @@
1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject
3 ProjectType="Visual C++"
4 Version="8,00"
5 Name="zlibvc"
6 ProjectGUID="{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
7 >
8 <Platforms>
9 <Platform
10 Name="Win32"
11 />
12 <Platform
13 Name="x64"
14 />
15 <Platform
16 Name="Itanium"
17 />
18 </Platforms>
19 <ToolFiles>
20 </ToolFiles>
21 <Configurations>
22 <Configuration
23 Name="Debug|Win32"
24 OutputDirectory="x86\ZlibDll$(ConfigurationName)"
25 IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"
26 ConfigurationType="2"
27 InheritedPropertySheets="UpgradeFromVC70.vsprops"
28 UseOfMFC="0"
29 ATLMinimizesCRunTimeLibraryUsage="false"
30 >
31 <Tool
32 Name="VCPreBuildEventTool"
33 />
34 <Tool
35 Name="VCCustomBuildTool"
36 />
37 <Tool
38 Name="VCXMLDataGeneratorTool"
39 />
40 <Tool
41 Name="VCWebServiceProxyGeneratorTool"
42 />
43 <Tool
44 Name="VCMIDLTool"
45 PreprocessorDefinitions="_DEBUG"
46 MkTypLibCompatible="true"
47 SuppressStartupBanner="true"
48 TargetEnvironment="1"
49 TypeLibraryName="$(OutDir)/zlibvc.tlb"
50 />
51 <Tool
52 Name="VCCLCompilerTool"
53 Optimization="0"
54 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
55 PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI,ASMV,ASMINF"
56 ExceptionHandling="0"
57 RuntimeLibrary="1"
58 BufferSecurityCheck="false"
59 PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
60 AssemblerListingLocation="$(IntDir)\"
61 ObjectFile="$(IntDir)\"
62 ProgramDataBaseFileName="$(OutDir)\"
63 BrowseInformation="0"
64 WarningLevel="3"
65 SuppressStartupBanner="true"
66 DebugInformationFormat="4"
67 />
68 <Tool
69 Name="VCManagedResourceCompilerTool"
70 />
71 <Tool
72 Name="VCResourceCompilerTool"
73 PreprocessorDefinitions="_DEBUG"
74 Culture="1036"
75 />
76 <Tool
77 Name="VCPreLinkEventTool"
78 />
79 <Tool
80 Name="VCLinkerTool"
81 AdditionalOptions="/MACHINE:I386"
82 AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj"
83 OutputFile="$(OutDir)\zlibwapi.dll"
84 LinkIncremental="2"
85 SuppressStartupBanner="true"
86 GenerateManifest="false"
87 ModuleDefinitionFile=".\zlibvc.def"
88 GenerateDebugInformation="true"
89 ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
90 GenerateMapFile="true"
91 MapFileName="$(OutDir)/zlibwapi.map"
92 SubSystem="2"
93 ImportLibrary="$(OutDir)/zlibwapi.lib"
94 />
95 <Tool
96 Name="VCALinkTool"
97 />
98 <Tool
99 Name="VCManifestTool"
100 />
101 <Tool
102 Name="VCXDCMakeTool"
103 />
104 <Tool
105 Name="VCBscMakeTool"
106 />
107 <Tool
108 Name="VCFxCopTool"
109 />
110 <Tool
111 Name="VCAppVerifierTool"
112 />
113 <Tool
114 Name="VCWebDeploymentTool"
115 />
116 <Tool
117 Name="VCPostBuildEventTool"
118 />
119 </Configuration>
120 <Configuration
121 Name="Debug|x64"
122 OutputDirectory="x64\ZlibDll$(ConfigurationName)"
123 IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"
124 ConfigurationType="2"
125 InheritedPropertySheets="UpgradeFromVC70.vsprops"
126 UseOfMFC="0"
127 ATLMinimizesCRunTimeLibraryUsage="false"
128 >
129 <Tool
130 Name="VCPreBuildEventTool"
131 />
132 <Tool
133 Name="VCCustomBuildTool"
134 />
135 <Tool
136 Name="VCXMLDataGeneratorTool"
137 />
138 <Tool
139 Name="VCWebServiceProxyGeneratorTool"
140 />
141 <Tool
142 Name="VCMIDLTool"
143 PreprocessorDefinitions="_DEBUG"
144 MkTypLibCompatible="true"
145 SuppressStartupBanner="true"
146 TargetEnvironment="3"
147 TypeLibraryName="$(OutDir)/zlibvc.tlb"
148 />
149 <Tool
150 Name="VCCLCompilerTool"
151 Optimization="0"
152 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
153 PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI,ASMV,ASMINF;WIN64"
154 ExceptionHandling="0"
155 RuntimeLibrary="3"
156 BufferSecurityCheck="false"
157 PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
158 AssemblerListingLocation="$(IntDir)\"
159 ObjectFile="$(IntDir)\"
160 ProgramDataBaseFileName="$(OutDir)\"
161 BrowseInformation="0"
162 WarningLevel="3"
163 SuppressStartupBanner="true"
164 DebugInformationFormat="3"
165 />
166 <Tool
167 Name="VCManagedResourceCompilerTool"
168 />
169 <Tool
170 Name="VCResourceCompilerTool"
171 PreprocessorDefinitions="_DEBUG"
172 Culture="1036"
173 />
174 <Tool
175 Name="VCPreLinkEventTool"
176 />
177 <Tool
178 Name="VCLinkerTool"
179 AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "
180 OutputFile="$(OutDir)\zlibwapi.dll"
181 LinkIncremental="2"
182 SuppressStartupBanner="true"
183 GenerateManifest="false"
184 ModuleDefinitionFile=".\zlibvc.def"
185 GenerateDebugInformation="true"
186 ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
187 GenerateMapFile="true"
188 MapFileName="$(OutDir)/zlibwapi.map"
189 SubSystem="2"
190 ImportLibrary="$(OutDir)/zlibwapi.lib"
191 TargetMachine="17"
192 />
193 <Tool
194 Name="VCALinkTool"
195 />
196 <Tool
197 Name="VCManifestTool"
198 />
199 <Tool
200 Name="VCXDCMakeTool"
201 />
202 <Tool
203 Name="VCBscMakeTool"
204 />
205 <Tool
206 Name="VCFxCopTool"
207 />
208 <Tool
209 Name="VCAppVerifierTool"
210 />
211 <Tool
212 Name="VCWebDeploymentTool"
213 />
214 <Tool
215 Name="VCPostBuildEventTool"
216 />
217 </Configuration>
218 <Configuration
219 Name="Debug|Itanium"
220 OutputDirectory="ia64\ZlibDll$(ConfigurationName)"
221 IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"
222 ConfigurationType="2"
223 InheritedPropertySheets="UpgradeFromVC70.vsprops"
224 UseOfMFC="0"
225 ATLMinimizesCRunTimeLibraryUsage="false"
226 >
227 <Tool
228 Name="VCPreBuildEventTool"
229 />
230 <Tool
231 Name="VCCustomBuildTool"
232 />
233 <Tool
234 Name="VCXMLDataGeneratorTool"
235 />
236 <Tool
237 Name="VCWebServiceProxyGeneratorTool"
238 />
239 <Tool
240 Name="VCMIDLTool"
241 PreprocessorDefinitions="_DEBUG"
242 MkTypLibCompatible="true"
243 SuppressStartupBanner="true"
244 TargetEnvironment="2"
245 TypeLibraryName="$(OutDir)/zlibvc.tlb"
246 />
247 <Tool
248 Name="VCCLCompilerTool"
249 Optimization="0"
250 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
251 PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;WIN64"
252 ExceptionHandling="0"
253 RuntimeLibrary="3"
254 BufferSecurityCheck="false"
255 PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
256 AssemblerListingLocation="$(IntDir)\"
257 ObjectFile="$(IntDir)\"
258 ProgramDataBaseFileName="$(OutDir)\"
259 BrowseInformation="0"
260 WarningLevel="3"
261 SuppressStartupBanner="true"
262 DebugInformationFormat="3"
263 />
264 <Tool
265 Name="VCManagedResourceCompilerTool"
266 />
267 <Tool
268 Name="VCResourceCompilerTool"
269 PreprocessorDefinitions="_DEBUG"
270 Culture="1036"
271 />
272 <Tool
273 Name="VCPreLinkEventTool"
274 />
275 <Tool
276 Name="VCLinkerTool"
277 OutputFile="$(OutDir)\zlibwapi.dll"
278 LinkIncremental="2"
279 SuppressStartupBanner="true"
280 GenerateManifest="false"
281 ModuleDefinitionFile=".\zlibvc.def"
282 GenerateDebugInformation="true"
283 ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
284 GenerateMapFile="true"
285 MapFileName="$(OutDir)/zlibwapi.map"
286 SubSystem="2"
287 ImportLibrary="$(OutDir)/zlibwapi.lib"
288 TargetMachine="5"
289 />
290 <Tool
291 Name="VCALinkTool"
292 />
293 <Tool
294 Name="VCManifestTool"
295 />
296 <Tool
297 Name="VCXDCMakeTool"
298 />
299 <Tool
300 Name="VCBscMakeTool"
301 />
302 <Tool
303 Name="VCFxCopTool"
304 />
305 <Tool
306 Name="VCAppVerifierTool"
307 />
308 <Tool
309 Name="VCWebDeploymentTool"
310 />
311 <Tool
312 Name="VCPostBuildEventTool"
313 />
314 </Configuration>
315 <Configuration
316 Name="ReleaseWithoutAsm|Win32"
317 OutputDirectory="x86\ZlibDll$(ConfigurationName)"
318 IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"
319 ConfigurationType="2"
320 InheritedPropertySheets="UpgradeFromVC70.vsprops"
321 UseOfMFC="0"
322 ATLMinimizesCRunTimeLibraryUsage="false"
323 WholeProgramOptimization="1"
324 >
325 <Tool
326 Name="VCPreBuildEventTool"
327 />
328 <Tool
329 Name="VCCustomBuildTool"
330 />
331 <Tool
332 Name="VCXMLDataGeneratorTool"
333 />
334 <Tool
335 Name="VCWebServiceProxyGeneratorTool"
336 />
337 <Tool
338 Name="VCMIDLTool"
339 PreprocessorDefinitions="NDEBUG"
340 MkTypLibCompatible="true"
341 SuppressStartupBanner="true"
342 TargetEnvironment="1"
343 TypeLibraryName="$(OutDir)/zlibvc.tlb"
344 />
345 <Tool
346 Name="VCCLCompilerTool"
347 InlineFunctionExpansion="1"
348 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
349 PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI"
350 StringPooling="true"
351 ExceptionHandling="0"
352 RuntimeLibrary="2"
353 BufferSecurityCheck="false"
354 EnableFunctionLevelLinking="true"
355 PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
356 AssemblerOutput="2"
357 AssemblerListingLocation="$(IntDir)\"
358 ObjectFile="$(IntDir)\"
359 ProgramDataBaseFileName="$(OutDir)\"
360 BrowseInformation="0"
361 WarningLevel="3"
362 SuppressStartupBanner="true"
363 />
364 <Tool
365 Name="VCManagedResourceCompilerTool"
366 />
367 <Tool
368 Name="VCResourceCompilerTool"
369 PreprocessorDefinitions="NDEBUG"
370 Culture="1036"
371 />
372 <Tool
373 Name="VCPreLinkEventTool"
374 />
375 <Tool
376 Name="VCLinkerTool"
377 AdditionalOptions="/MACHINE:I386"
378 OutputFile="$(OutDir)\zlibwapi.dll"
379 LinkIncremental="1"
380 SuppressStartupBanner="true"
381 GenerateManifest="false"
382 IgnoreAllDefaultLibraries="false"
383 ModuleDefinitionFile=".\zlibvc.def"
384 ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
385 GenerateMapFile="true"
386 MapFileName="$(OutDir)/zlibwapi.map"
387 SubSystem="2"
388 OptimizeForWindows98="1"
389 ImportLibrary="$(OutDir)/zlibwapi.lib"
390 />
391 <Tool
392 Name="VCALinkTool"
393 />
394 <Tool
395 Name="VCManifestTool"
396 />
397 <Tool
398 Name="VCXDCMakeTool"
399 />
400 <Tool
401 Name="VCBscMakeTool"
402 />
403 <Tool
404 Name="VCFxCopTool"
405 />
406 <Tool
407 Name="VCAppVerifierTool"
408 />
409 <Tool
410 Name="VCWebDeploymentTool"
411 />
412 <Tool
413 Name="VCPostBuildEventTool"
414 />
415 </Configuration>
416 <Configuration
417 Name="ReleaseWithoutAsm|x64"
418 OutputDirectory="x64\ZlibDll$(ConfigurationName)"
419 IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"
420 ConfigurationType="2"
421 InheritedPropertySheets="UpgradeFromVC70.vsprops"
422 UseOfMFC="0"
423 ATLMinimizesCRunTimeLibraryUsage="false"
424 WholeProgramOptimization="1"
425 >
426 <Tool
427 Name="VCPreBuildEventTool"
428 />
429 <Tool
430 Name="VCCustomBuildTool"
431 />
432 <Tool
433 Name="VCXMLDataGeneratorTool"
434 />
435 <Tool
436 Name="VCWebServiceProxyGeneratorTool"
437 />
438 <Tool
439 Name="VCMIDLTool"
440 PreprocessorDefinitions="NDEBUG"
441 MkTypLibCompatible="true"
442 SuppressStartupBanner="true"
443 TargetEnvironment="3"
444 TypeLibraryName="$(OutDir)/zlibvc.tlb"
445 />
446 <Tool
447 Name="VCCLCompilerTool"
448 InlineFunctionExpansion="1"
449 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
450 PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI;WIN64"
451 StringPooling="true"
452 ExceptionHandling="0"
453 RuntimeLibrary="2"
454 BufferSecurityCheck="false"
455 EnableFunctionLevelLinking="true"
456 PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
457 AssemblerOutput="2"
458 AssemblerListingLocation="$(IntDir)\"
459 ObjectFile="$(IntDir)\"
460 ProgramDataBaseFileName="$(OutDir)\"
461 BrowseInformation="0"
462 WarningLevel="3"
463 SuppressStartupBanner="true"
464 />
465 <Tool
466 Name="VCManagedResourceCompilerTool"
467 />
468 <Tool
469 Name="VCResourceCompilerTool"
470 PreprocessorDefinitions="NDEBUG"
471 Culture="1036"
472 />
473 <Tool
474 Name="VCPreLinkEventTool"
475 />
476 <Tool
477 Name="VCLinkerTool"
478 OutputFile="$(OutDir)\zlibwapi.dll"
479 LinkIncremental="1"
480 SuppressStartupBanner="true"
481 GenerateManifest="false"
482 IgnoreAllDefaultLibraries="false"
483 ModuleDefinitionFile=".\zlibvc.def"
484 ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
485 GenerateMapFile="true"
486 MapFileName="$(OutDir)/zlibwapi.map"
487 SubSystem="2"
488 OptimizeForWindows98="1"
489 ImportLibrary="$(OutDir)/zlibwapi.lib"
490 TargetMachine="17"
491 />
492 <Tool
493 Name="VCALinkTool"
494 />
495 <Tool
496 Name="VCManifestTool"
497 />
498 <Tool
499 Name="VCXDCMakeTool"
500 />
501 <Tool
502 Name="VCBscMakeTool"
503 />
504 <Tool
505 Name="VCFxCopTool"
506 />
507 <Tool
508 Name="VCAppVerifierTool"
509 />
510 <Tool
511 Name="VCWebDeploymentTool"
512 />
513 <Tool
514 Name="VCPostBuildEventTool"
515 />
516 </Configuration>
517 <Configuration
518 Name="ReleaseWithoutAsm|Itanium"
519 OutputDirectory="ia64\ZlibDll$(ConfigurationName)"
520 IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"
521 ConfigurationType="2"
522 InheritedPropertySheets="UpgradeFromVC70.vsprops"
523 UseOfMFC="0"
524 ATLMinimizesCRunTimeLibraryUsage="false"
525 WholeProgramOptimization="1"
526 >
527 <Tool
528 Name="VCPreBuildEventTool"
529 />
530 <Tool
531 Name="VCCustomBuildTool"
532 />
533 <Tool
534 Name="VCXMLDataGeneratorTool"
535 />
536 <Tool
537 Name="VCWebServiceProxyGeneratorTool"
538 />
539 <Tool
540 Name="VCMIDLTool"
541 PreprocessorDefinitions="NDEBUG"
542 MkTypLibCompatible="true"
543 SuppressStartupBanner="true"
544 TargetEnvironment="2"
545 TypeLibraryName="$(OutDir)/zlibvc.tlb"
546 />
547 <Tool
548 Name="VCCLCompilerTool"
549 InlineFunctionExpansion="1"
550 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
551 PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI;WIN64"
552 StringPooling="true"
553 ExceptionHandling="0"
554 RuntimeLibrary="2"
555 BufferSecurityCheck="false"
556 EnableFunctionLevelLinking="true"
557 PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
558 AssemblerOutput="2"
559 AssemblerListingLocation="$(IntDir)\"
560 ObjectFile="$(IntDir)\"
561 ProgramDataBaseFileName="$(OutDir)\"
562 BrowseInformation="0"
563 WarningLevel="3"
564 SuppressStartupBanner="true"
565 />
566 <Tool
567 Name="VCManagedResourceCompilerTool"
568 />
569 <Tool
570 Name="VCResourceCompilerTool"
571 PreprocessorDefinitions="NDEBUG"
572 Culture="1036"
573 />
574 <Tool
575 Name="VCPreLinkEventTool"
576 />
577 <Tool
578 Name="VCLinkerTool"
579 OutputFile="$(OutDir)\zlibwapi.dll"
580 LinkIncremental="1"
581 SuppressStartupBanner="true"
582 GenerateManifest="false"
583 IgnoreAllDefaultLibraries="false"
584 ModuleDefinitionFile=".\zlibvc.def"
585 ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
586 GenerateMapFile="true"
587 MapFileName="$(OutDir)/zlibwapi.map"
588 SubSystem="2"
589 OptimizeForWindows98="1"
590 ImportLibrary="$(OutDir)/zlibwapi.lib"
591 TargetMachine="5"
592 />
593 <Tool
594 Name="VCALinkTool"
595 />
596 <Tool
597 Name="VCManifestTool"
598 />
599 <Tool
600 Name="VCXDCMakeTool"
601 />
602 <Tool
603 Name="VCBscMakeTool"
604 />
605 <Tool
606 Name="VCFxCopTool"
607 />
608 <Tool
609 Name="VCAppVerifierTool"
610 />
611 <Tool
612 Name="VCWebDeploymentTool"
613 />
614 <Tool
615 Name="VCPostBuildEventTool"
616 />
617 </Configuration>
618 <Configuration
619 Name="Release|Win32"
620 OutputDirectory="x86\ZlibDll$(ConfigurationName)"
621 IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"
622 ConfigurationType="2"
623 InheritedPropertySheets="UpgradeFromVC70.vsprops"
624 UseOfMFC="0"
625 ATLMinimizesCRunTimeLibraryUsage="false"
626 WholeProgramOptimization="1"
627 >
628 <Tool
629 Name="VCPreBuildEventTool"
630 />
631 <Tool
632 Name="VCCustomBuildTool"
633 />
634 <Tool
635 Name="VCXMLDataGeneratorTool"
636 />
637 <Tool
638 Name="VCWebServiceProxyGeneratorTool"
639 />
640 <Tool
641 Name="VCMIDLTool"
642 PreprocessorDefinitions="NDEBUG"
643 MkTypLibCompatible="true"
644 SuppressStartupBanner="true"
645 TargetEnvironment="1"
646 TypeLibraryName="$(OutDir)/zlibvc.tlb"
647 />
648 <Tool
649 Name="VCCLCompilerTool"
650 InlineFunctionExpansion="1"
651 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
652 PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;ASMV;ASMINF"
653 StringPooling="true"
654 ExceptionHandling="0"
655 RuntimeLibrary="2"
656 BufferSecurityCheck="false"
657 EnableFunctionLevelLinking="true"
658 PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
659 AssemblerOutput="2"
660 AssemblerListingLocation="$(IntDir)\"
661 ObjectFile="$(IntDir)\"
662 ProgramDataBaseFileName="$(OutDir)\"
663 BrowseInformation="0"
664 WarningLevel="3"
665 SuppressStartupBanner="true"
666 />
667 <Tool
668 Name="VCManagedResourceCompilerTool"
669 />
670 <Tool
671 Name="VCResourceCompilerTool"
672 PreprocessorDefinitions="NDEBUG"
673 Culture="1036"
674 />
675 <Tool
676 Name="VCPreLinkEventTool"
677 />
678 <Tool
679 Name="VCLinkerTool"
680 AdditionalOptions="/MACHINE:I386"
681 AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj "
682 OutputFile="$(OutDir)\zlibwapi.dll"
683 LinkIncremental="1"
684 SuppressStartupBanner="true"
685 GenerateManifest="false"
686 IgnoreAllDefaultLibraries="false"
687 ModuleDefinitionFile=".\zlibvc.def"
688 ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
689 GenerateMapFile="true"
690 MapFileName="$(OutDir)/zlibwapi.map"
691 SubSystem="2"
692 OptimizeForWindows98="1"
693 ImportLibrary="$(OutDir)/zlibwapi.lib"
694 />
695 <Tool
696 Name="VCALinkTool"
697 />
698 <Tool
699 Name="VCManifestTool"
700 />
701 <Tool
702 Name="VCXDCMakeTool"
703 />
704 <Tool
705 Name="VCBscMakeTool"
706 />
707 <Tool
708 Name="VCFxCopTool"
709 />
710 <Tool
711 Name="VCAppVerifierTool"
712 />
713 <Tool
714 Name="VCWebDeploymentTool"
715 />
716 <Tool
717 Name="VCPostBuildEventTool"
718 />
719 </Configuration>
720 <Configuration
721 Name="Release|x64"
722 OutputDirectory="x64\ZlibDll$(ConfigurationName)"
723 IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"
724 ConfigurationType="2"
725 InheritedPropertySheets="UpgradeFromVC70.vsprops"
726 UseOfMFC="0"
727 ATLMinimizesCRunTimeLibraryUsage="false"
728 WholeProgramOptimization="1"
729 >
730 <Tool
731 Name="VCPreBuildEventTool"
732 />
733 <Tool
734 Name="VCCustomBuildTool"
735 />
736 <Tool
737 Name="VCXMLDataGeneratorTool"
738 />
739 <Tool
740 Name="VCWebServiceProxyGeneratorTool"
741 />
742 <Tool
743 Name="VCMIDLTool"
744 PreprocessorDefinitions="NDEBUG"
745 MkTypLibCompatible="true"
746 SuppressStartupBanner="true"
747 TargetEnvironment="3"
748 TypeLibraryName="$(OutDir)/zlibvc.tlb"
749 />
750 <Tool
751 Name="VCCLCompilerTool"
752 InlineFunctionExpansion="1"
753 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
754 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;ASMV;ASMINF;WIN64"
755 StringPooling="true"
756 ExceptionHandling="0"
757 RuntimeLibrary="2"
758 BufferSecurityCheck="false"
759 EnableFunctionLevelLinking="true"
760 PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
761 AssemblerOutput="2"
762 AssemblerListingLocation="$(IntDir)\"
763 ObjectFile="$(IntDir)\"
764 ProgramDataBaseFileName="$(OutDir)\"
765 BrowseInformation="0"
766 WarningLevel="3"
767 SuppressStartupBanner="true"
768 />
769 <Tool
770 Name="VCManagedResourceCompilerTool"
771 />
772 <Tool
773 Name="VCResourceCompilerTool"
774 PreprocessorDefinitions="NDEBUG"
775 Culture="1036"
776 />
777 <Tool
778 Name="VCPreLinkEventTool"
779 />
780 <Tool
781 Name="VCLinkerTool"
782 AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "
783 OutputFile="$(OutDir)\zlibwapi.dll"
784 LinkIncremental="1"
785 SuppressStartupBanner="true"
786 GenerateManifest="false"
787 IgnoreAllDefaultLibraries="false"
788 ModuleDefinitionFile=".\zlibvc.def"
789 ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
790 GenerateMapFile="true"
791 MapFileName="$(OutDir)/zlibwapi.map"
792 SubSystem="2"
793 OptimizeForWindows98="1"
794 ImportLibrary="$(OutDir)/zlibwapi.lib"
795 TargetMachine="17"
796 />
797 <Tool
798 Name="VCALinkTool"
799 />
800 <Tool
801 Name="VCManifestTool"
802 />
803 <Tool
804 Name="VCXDCMakeTool"
805 />
806 <Tool
807 Name="VCBscMakeTool"
808 />
809 <Tool
810 Name="VCFxCopTool"
811 />
812 <Tool
813 Name="VCAppVerifierTool"
814 />
815 <Tool
816 Name="VCWebDeploymentTool"
817 />
818 <Tool
819 Name="VCPostBuildEventTool"
820 />
821 </Configuration>
822 <Configuration
823 Name="Release|Itanium"
824 OutputDirectory="ia64\ZlibDll$(ConfigurationName)"
825 IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"
826 ConfigurationType="2"
827 InheritedPropertySheets="UpgradeFromVC70.vsprops"
828 UseOfMFC="0"
829 ATLMinimizesCRunTimeLibraryUsage="false"
830 WholeProgramOptimization="1"
831 >
832 <Tool
833 Name="VCPreBuildEventTool"
834 />
835 <Tool
836 Name="VCCustomBuildTool"
837 />
838 <Tool
839 Name="VCXMLDataGeneratorTool"
840 />
841 <Tool
842 Name="VCWebServiceProxyGeneratorTool"
843 />
844 <Tool
845 Name="VCMIDLTool"
846 PreprocessorDefinitions="NDEBUG"
847 MkTypLibCompatible="true"
848 SuppressStartupBanner="true"
849 TargetEnvironment="2"
850 TypeLibraryName="$(OutDir)/zlibvc.tlb"
851 />
852 <Tool
853 Name="VCCLCompilerTool"
854 InlineFunctionExpansion="1"
855 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
856 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;WIN64"
857 StringPooling="true"
858 ExceptionHandling="0"
859 RuntimeLibrary="2"
860 BufferSecurityCheck="false"
861 EnableFunctionLevelLinking="true"
862 PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
863 AssemblerOutput="2"
864 AssemblerListingLocation="$(IntDir)\"
865 ObjectFile="$(IntDir)\"
866 ProgramDataBaseFileName="$(OutDir)\"
867 BrowseInformation="0"
868 WarningLevel="3"
869 SuppressStartupBanner="true"
870 />
871 <Tool
872 Name="VCManagedResourceCompilerTool"
873 />
874 <Tool
875 Name="VCResourceCompilerTool"
876 PreprocessorDefinitions="NDEBUG"
877 Culture="1036"
878 />
879 <Tool
880 Name="VCPreLinkEventTool"
881 />
882 <Tool
883 Name="VCLinkerTool"
884 OutputFile="$(OutDir)\zlibwapi.dll"
885 LinkIncremental="1"
886 SuppressStartupBanner="true"
887 GenerateManifest="false"
888 IgnoreAllDefaultLibraries="false"
889 ModuleDefinitionFile=".\zlibvc.def"
890 ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
891 GenerateMapFile="true"
892 MapFileName="$(OutDir)/zlibwapi.map"
893 SubSystem="2"
894 OptimizeForWindows98="1"
895 ImportLibrary="$(OutDir)/zlibwapi.lib"
896 TargetMachine="5"
897 />
898 <Tool
899 Name="VCALinkTool"
900 />
901 <Tool
902 Name="VCManifestTool"
903 />
904 <Tool
905 Name="VCXDCMakeTool"
906 />
907 <Tool
908 Name="VCBscMakeTool"
909 />
910 <Tool
911 Name="VCFxCopTool"
912 />
913 <Tool
914 Name="VCAppVerifierTool"
915 />
916 <Tool
917 Name="VCWebDeploymentTool"
918 />
919 <Tool
920 Name="VCPostBuildEventTool"
921 />
922 </Configuration>
923 </Configurations>
924 <References>
925 </References>
926 <Files>
927 <Filter
928 Name="Source Files"
929 Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
930 >
931 <File
932 RelativePath="..\..\..\adler32.c"
933 >
934 </File>
935 <File
936 RelativePath="..\..\..\compress.c"
937 >
938 </File>
939 <File
940 RelativePath="..\..\..\crc32.c"
941 >
942 </File>
943 <File
944 RelativePath="..\..\..\deflate.c"
945 >
946 </File>
947 <File
948 RelativePath="..\..\masmx86\gvmat32c.c"
949 >
950 <FileConfiguration
951 Name="Debug|x64"
952 ExcludedFromBuild="true"
953 >
954 <Tool
955 Name="VCCLCompilerTool"
956 />
957 </FileConfiguration>
958 <FileConfiguration
959 Name="Debug|Itanium"
960 ExcludedFromBuild="true"
961 >
962 <Tool
963 Name="VCCLCompilerTool"
964 />
965 </FileConfiguration>
966 <FileConfiguration
967 Name="ReleaseWithoutAsm|Win32"
968 ExcludedFromBuild="true"
969 >
970 <Tool
971 Name="VCCLCompilerTool"
972 />
973 </FileConfiguration>
974 <FileConfiguration
975 Name="ReleaseWithoutAsm|x64"
976 ExcludedFromBuild="true"
977 >
978 <Tool
979 Name="VCCLCompilerTool"
980 />
981 </FileConfiguration>
982 <FileConfiguration
983 Name="ReleaseWithoutAsm|Itanium"
984 ExcludedFromBuild="true"
985 >
986 <Tool
987 Name="VCCLCompilerTool"
988 />
989 </FileConfiguration>
990 <FileConfiguration
991 Name="Release|x64"
992 ExcludedFromBuild="true"
993 >
994 <Tool
995 Name="VCCLCompilerTool"
996 />
997 </FileConfiguration>
998 <FileConfiguration
999 Name="Release|Itanium"
1000 ExcludedFromBuild="true"
1001 >
1002 <Tool
1003 Name="VCCLCompilerTool"
1004 />
1005 </FileConfiguration>
1006 </File>
1007 <File
1008 RelativePath="..\..\..\gzclose.c">
1009 </File>
1010 <File
1011 RelativePath="..\..\..\gzio.c">
1012 </File>
1013 <File
1014 RelativePath="..\..\..\gzlib.c">
1015 </File>
1016 <File
1017 RelativePath="..\..\..\gzread.c">
1018 </File>
1019 <File
1020 RelativePath="..\..\..\gzwrite.c">
1021 </File>
1022 <File
1023 RelativePath="..\..\..\infback.c"
1024 >
1025 </File>
1026 <File
1027 RelativePath="..\..\masmx64\inffas8664.c"
1028 >
1029 <FileConfiguration
1030 Name="Debug|Win32"
1031 ExcludedFromBuild="true"
1032 >
1033 <Tool
1034 Name="VCCLCompilerTool"
1035 />
1036 </FileConfiguration>
1037 <FileConfiguration
1038 Name="Debug|Itanium"
1039 ExcludedFromBuild="true"
1040 >
1041 <Tool
1042 Name="VCCLCompilerTool"
1043 />
1044 </FileConfiguration>
1045 <FileConfiguration
1046 Name="ReleaseWithoutAsm|Win32"
1047 ExcludedFromBuild="true"
1048 >
1049 <Tool
1050 Name="VCCLCompilerTool"
1051 />
1052 </FileConfiguration>
1053 <FileConfiguration
1054 Name="ReleaseWithoutAsm|Itanium"
1055 ExcludedFromBuild="true"
1056 >
1057 <Tool
1058 Name="VCCLCompilerTool"
1059 />
1060 </FileConfiguration>
1061 <FileConfiguration
1062 Name="Release|Win32"
1063 ExcludedFromBuild="true"
1064 >
1065 <Tool
1066 Name="VCCLCompilerTool"
1067 />
1068 </FileConfiguration>
1069 <FileConfiguration
1070 Name="Release|Itanium"
1071 ExcludedFromBuild="true"
1072 >
1073 <Tool
1074 Name="VCCLCompilerTool"
1075 />
1076 </FileConfiguration>
1077 </File>
1078 <File
1079 RelativePath="..\..\..\inffast.c"
1080 >
1081 </File>
1082 <File
1083 RelativePath="..\..\..\inflate.c"
1084 >
1085 </File>
1086 <File
1087 RelativePath="..\..\..\inftrees.c"
1088 >
1089 </File>
1090 <File
1091 RelativePath="..\..\minizip\ioapi.c"
1092 >
1093 </File>
1094 <File
1095 RelativePath="..\..\minizip\iowin32.c"
1096 >
1097 </File>
1098 <File
1099 RelativePath="..\..\..\trees.c"
1100 >
1101 </File>
1102 <File
1103 RelativePath="..\..\..\uncompr.c"
1104 >
1105 </File>
1106 <File
1107 RelativePath="..\..\minizip\unzip.c"
1108 >
1109 <FileConfiguration
1110 Name="Release|Win32"
1111 >
1112 <Tool
1113 Name="VCCLCompilerTool"
1114 AdditionalIncludeDirectories=""
1115 PreprocessorDefinitions="ZLIB_INTERNAL"
1116 />
1117 </FileConfiguration>
1118 <FileConfiguration
1119 Name="Release|x64"
1120 >
1121 <Tool
1122 Name="VCCLCompilerTool"
1123 AdditionalIncludeDirectories=""
1124 PreprocessorDefinitions="ZLIB_INTERNAL"
1125 />
1126 </FileConfiguration>
1127 <FileConfiguration
1128 Name="Release|Itanium"
1129 >
1130 <Tool
1131 Name="VCCLCompilerTool"
1132 AdditionalIncludeDirectories=""
1133 PreprocessorDefinitions="ZLIB_INTERNAL"
1134 />
1135 </FileConfiguration>
1136 </File>
1137 <File
1138 RelativePath="..\..\minizip\zip.c"
1139 >
1140 <FileConfiguration
1141 Name="Release|Win32"
1142 >
1143 <Tool
1144 Name="VCCLCompilerTool"
1145 AdditionalIncludeDirectories=""
1146 PreprocessorDefinitions="ZLIB_INTERNAL"
1147 />
1148 </FileConfiguration>
1149 <FileConfiguration
1150 Name="Release|x64"
1151 >
1152 <Tool
1153 Name="VCCLCompilerTool"
1154 AdditionalIncludeDirectories=""
1155 PreprocessorDefinitions="ZLIB_INTERNAL"
1156 />
1157 </FileConfiguration>
1158 <FileConfiguration
1159 Name="Release|Itanium"
1160 >
1161 <Tool
1162 Name="VCCLCompilerTool"
1163 AdditionalIncludeDirectories=""
1164 PreprocessorDefinitions="ZLIB_INTERNAL"
1165 />
1166 </FileConfiguration>
1167 </File>
1168 <File
1169 RelativePath=".\zlib.rc"
1170 >
1171 </File>
1172 <File
1173 RelativePath=".\zlibvc.def"
1174 >
1175 </File>
1176 <File
1177 RelativePath="..\..\..\zutil.c"
1178 >
1179 </File>
1180 </Filter>
1181 <Filter
1182 Name="Header Files"
1183 Filter="h;hpp;hxx;hm;inl;fi;fd"
1184 >
1185 <File
1186 RelativePath="..\..\..\deflate.h"
1187 >
1188 </File>
1189 <File
1190 RelativePath="..\..\..\infblock.h"
1191 >
1192 </File>
1193 <File
1194 RelativePath="..\..\..\infcodes.h"
1195 >
1196 </File>
1197 <File
1198 RelativePath="..\..\..\inffast.h"
1199 >
1200 </File>
1201 <File
1202 RelativePath="..\..\..\inftrees.h"
1203 >
1204 </File>
1205 <File
1206 RelativePath="..\..\..\infutil.h"
1207 >
1208 </File>
1209 <File
1210 RelativePath="..\..\..\zconf.h"
1211 >
1212 </File>
1213 <File
1214 RelativePath="..\..\..\zlib.h"
1215 >
1216 </File>
1217 <File
1218 RelativePath="..\..\..\zutil.h"
1219 >
1220 </File>
1221 </Filter>
1222 <Filter
1223 Name="Resource Files"
1224 Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
1225 >
1226 </Filter>
1227 </Files>
1228 <Globals>
1229 </Globals>
1230</VisualStudioProject>
diff --git a/contrib/vstudio/vc8/miniunz.vcproj b/contrib/vstudio/vc9/miniunz.vcproj
index 4af53e8..7da32b9 100644
--- a/contrib/vstudio/vc8/miniunz.vcproj
+++ b/contrib/vstudio/vc9/miniunz.vcproj
@@ -1,10 +1,11 @@
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="miniunz" 5 Name="miniunz"
6 ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694382A}" 6 ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
7 Keyword="Win32Proj" 7 Keyword="Win32Proj"
8 TargetFrameworkVersion="131072"
8 > 9 >
9 <Platforms> 10 <Platforms>
10 <Platform 11 <Platform
@@ -76,6 +77,8 @@
76 GenerateDebugInformation="true" 77 GenerateDebugInformation="true"
77 ProgramDatabaseFile="$(OutDir)/miniunz.pdb" 78 ProgramDatabaseFile="$(OutDir)/miniunz.pdb"
78 SubSystem="1" 79 SubSystem="1"
80 RandomizedBaseAddress="1"
81 DataExecutionPrevention="0"
79 TargetMachine="1" 82 TargetMachine="1"
80 /> 83 />
81 <Tool 84 <Tool
@@ -97,16 +100,13 @@
97 Name="VCAppVerifierTool" 100 Name="VCAppVerifierTool"
98 /> 101 />
99 <Tool 102 <Tool
100 Name="VCWebDeploymentTool"
101 />
102 <Tool
103 Name="VCPostBuildEventTool" 103 Name="VCPostBuildEventTool"
104 /> 104 />
105 </Configuration> 105 </Configuration>
106 <Configuration 106 <Configuration
107 Name="Debug|x64" 107 Name="Release|Win32"
108 OutputDirectory="x64\MiniUnzip$(ConfigurationName)" 108 OutputDirectory="x86\MiniUnzip$(ConfigurationName)"
109 IntermediateDirectory="x64\MiniUnzip$(ConfigurationName)\Tmp" 109 IntermediateDirectory="x86\MiniUnzip$(ConfigurationName)\Tmp"
110 ConfigurationType="1" 110 ConfigurationType="1"
111 InheritedPropertySheets="UpgradeFromVC70.vsprops" 111 InheritedPropertySheets="UpgradeFromVC70.vsprops"
112 CharacterSet="2" 112 CharacterSet="2"
@@ -125,17 +125,19 @@
125 /> 125 />
126 <Tool 126 <Tool
127 Name="VCMIDLTool" 127 Name="VCMIDLTool"
128 TargetEnvironment="3"
129 /> 128 />
130 <Tool 129 <Tool
131 Name="VCCLCompilerTool" 130 Name="VCCLCompilerTool"
132 Optimization="0" 131 Optimization="2"
132 InlineFunctionExpansion="1"
133 OmitFramePointers="true"
133 AdditionalIncludeDirectories="..\..\..;..\..\minizip" 134 AdditionalIncludeDirectories="..\..\..;..\..\minizip"
134 PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64" 135 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"
135 MinimalRebuild="true" 136 StringPooling="true"
136 BasicRuntimeChecks="0" 137 BasicRuntimeChecks="0"
137 RuntimeLibrary="3" 138 RuntimeLibrary="0"
138 BufferSecurityCheck="false" 139 BufferSecurityCheck="false"
140 EnableFunctionLevelLinking="true"
139 UsePrecompiledHeader="0" 141 UsePrecompiledHeader="0"
140 AssemblerListingLocation="$(IntDir)\" 142 AssemblerListingLocation="$(IntDir)\"
141 WarningLevel="3" 143 WarningLevel="3"
@@ -153,14 +155,18 @@
153 /> 155 />
154 <Tool 156 <Tool
155 Name="VCLinkerTool" 157 Name="VCLinkerTool"
156 AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib" 158 AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"
157 OutputFile="$(OutDir)/miniunz.exe" 159 OutputFile="$(OutDir)/miniunz.exe"
158 LinkIncremental="2" 160 LinkIncremental="1"
159 GenerateManifest="false" 161 GenerateManifest="false"
160 GenerateDebugInformation="true" 162 GenerateDebugInformation="true"
161 ProgramDatabaseFile="$(OutDir)/miniunz.pdb"
162 SubSystem="1" 163 SubSystem="1"
163 TargetMachine="17" 164 OptimizeReferences="2"
165 EnableCOMDATFolding="2"
166 OptimizeForWindows98="1"
167 RandomizedBaseAddress="1"
168 DataExecutionPrevention="0"
169 TargetMachine="1"
164 /> 170 />
165 <Tool 171 <Tool
166 Name="VCALinkTool" 172 Name="VCALinkTool"
@@ -181,16 +187,13 @@
181 Name="VCAppVerifierTool" 187 Name="VCAppVerifierTool"
182 /> 188 />
183 <Tool 189 <Tool
184 Name="VCWebDeploymentTool"
185 />
186 <Tool
187 Name="VCPostBuildEventTool" 190 Name="VCPostBuildEventTool"
188 /> 191 />
189 </Configuration> 192 </Configuration>
190 <Configuration 193 <Configuration
191 Name="Debug|Itanium" 194 Name="Debug|x64"
192 OutputDirectory="ia64\MiniUnzip$(ConfigurationName)" 195 OutputDirectory="x64\MiniUnzip$(ConfigurationName)"
193 IntermediateDirectory="ia64\MiniUnzip$(ConfigurationName)\Tmp" 196 IntermediateDirectory="x64\MiniUnzip$(ConfigurationName)\Tmp"
194 ConfigurationType="1" 197 ConfigurationType="1"
195 InheritedPropertySheets="UpgradeFromVC70.vsprops" 198 InheritedPropertySheets="UpgradeFromVC70.vsprops"
196 CharacterSet="2" 199 CharacterSet="2"
@@ -209,7 +212,7 @@
209 /> 212 />
210 <Tool 213 <Tool
211 Name="VCMIDLTool" 214 Name="VCMIDLTool"
212 TargetEnvironment="2" 215 TargetEnvironment="3"
213 /> 216 />
214 <Tool 217 <Tool
215 Name="VCCLCompilerTool" 218 Name="VCCLCompilerTool"
@@ -237,14 +240,14 @@
237 /> 240 />
238 <Tool 241 <Tool
239 Name="VCLinkerTool" 242 Name="VCLinkerTool"
240 AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib" 243 AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"
241 OutputFile="$(OutDir)/miniunz.exe" 244 OutputFile="$(OutDir)/miniunz.exe"
242 LinkIncremental="2" 245 LinkIncremental="2"
243 GenerateManifest="false" 246 GenerateManifest="false"
244 GenerateDebugInformation="true" 247 GenerateDebugInformation="true"
245 ProgramDatabaseFile="$(OutDir)/miniunz.pdb" 248 ProgramDatabaseFile="$(OutDir)/miniunz.pdb"
246 SubSystem="1" 249 SubSystem="1"
247 TargetMachine="5" 250 TargetMachine="17"
248 /> 251 />
249 <Tool 252 <Tool
250 Name="VCALinkTool" 253 Name="VCALinkTool"
@@ -272,9 +275,9 @@
272 /> 275 />
273 </Configuration> 276 </Configuration>
274 <Configuration 277 <Configuration
275 Name="Release|Win32" 278 Name="Debug|Itanium"
276 OutputDirectory="x86\MiniUnzip$(ConfigurationName)" 279 OutputDirectory="ia64\MiniUnzip$(ConfigurationName)"
277 IntermediateDirectory="x86\MiniUnzip$(ConfigurationName)\Tmp" 280 IntermediateDirectory="ia64\MiniUnzip$(ConfigurationName)\Tmp"
278 ConfigurationType="1" 281 ConfigurationType="1"
279 InheritedPropertySheets="UpgradeFromVC70.vsprops" 282 InheritedPropertySheets="UpgradeFromVC70.vsprops"
280 CharacterSet="2" 283 CharacterSet="2"
@@ -293,19 +296,17 @@
293 /> 296 />
294 <Tool 297 <Tool
295 Name="VCMIDLTool" 298 Name="VCMIDLTool"
299 TargetEnvironment="2"
296 /> 300 />
297 <Tool 301 <Tool
298 Name="VCCLCompilerTool" 302 Name="VCCLCompilerTool"
299 Optimization="2" 303 Optimization="0"
300 InlineFunctionExpansion="1"
301 OmitFramePointers="true"
302 AdditionalIncludeDirectories="..\..\..;..\..\minizip" 304 AdditionalIncludeDirectories="..\..\..;..\..\minizip"
303 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE" 305 PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
304 StringPooling="true" 306 MinimalRebuild="true"
305 BasicRuntimeChecks="0" 307 BasicRuntimeChecks="0"
306 RuntimeLibrary="0" 308 RuntimeLibrary="3"
307 BufferSecurityCheck="false" 309 BufferSecurityCheck="false"
308 EnableFunctionLevelLinking="true"
309 UsePrecompiledHeader="0" 310 UsePrecompiledHeader="0"
310 AssemblerListingLocation="$(IntDir)\" 311 AssemblerListingLocation="$(IntDir)\"
311 WarningLevel="3" 312 WarningLevel="3"
@@ -323,16 +324,14 @@
323 /> 324 />
324 <Tool 325 <Tool
325 Name="VCLinkerTool" 326 Name="VCLinkerTool"
326 AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib" 327 AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"
327 OutputFile="$(OutDir)/miniunz.exe" 328 OutputFile="$(OutDir)/miniunz.exe"
328 LinkIncremental="1" 329 LinkIncremental="2"
329 GenerateManifest="false" 330 GenerateManifest="false"
330 GenerateDebugInformation="true" 331 GenerateDebugInformation="true"
332 ProgramDatabaseFile="$(OutDir)/miniunz.pdb"
331 SubSystem="1" 333 SubSystem="1"
332 OptimizeReferences="2" 334 TargetMachine="5"
333 EnableCOMDATFolding="2"
334 OptimizeForWindows98="1"
335 TargetMachine="1"
336 /> 335 />
337 <Tool 336 <Tool
338 Name="VCALinkTool" 337 Name="VCALinkTool"
diff --git a/contrib/vstudio/vc8/minizip.vcproj b/contrib/vstudio/vc9/minizip.vcproj
index 85f64c4..e57e07d 100644
--- a/contrib/vstudio/vc8/minizip.vcproj
+++ b/contrib/vstudio/vc9/minizip.vcproj
@@ -1,10 +1,11 @@
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="minizip" 5 Name="minizip"
6 ProjectGUID="{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}" 6 ProjectGUID="{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
7 Keyword="Win32Proj" 7 Keyword="Win32Proj"
8 TargetFrameworkVersion="131072"
8 > 9 >
9 <Platforms> 10 <Platforms>
10 <Platform 11 <Platform
@@ -76,6 +77,8 @@
76 GenerateDebugInformation="true" 77 GenerateDebugInformation="true"
77 ProgramDatabaseFile="$(OutDir)/minizip.pdb" 78 ProgramDatabaseFile="$(OutDir)/minizip.pdb"
78 SubSystem="1" 79 SubSystem="1"
80 RandomizedBaseAddress="1"
81 DataExecutionPrevention="0"
79 TargetMachine="1" 82 TargetMachine="1"
80 /> 83 />
81 <Tool 84 <Tool
@@ -97,16 +100,13 @@
97 Name="VCAppVerifierTool" 100 Name="VCAppVerifierTool"
98 /> 101 />
99 <Tool 102 <Tool
100 Name="VCWebDeploymentTool"
101 />
102 <Tool
103 Name="VCPostBuildEventTool" 103 Name="VCPostBuildEventTool"
104 /> 104 />
105 </Configuration> 105 </Configuration>
106 <Configuration 106 <Configuration
107 Name="Debug|x64" 107 Name="Release|Win32"
108 OutputDirectory="x64\$(ConfigurationName)" 108 OutputDirectory="x86\MiniZip$(ConfigurationName)"
109 IntermediateDirectory="x64\$(ConfigurationName)" 109 IntermediateDirectory="x86\MiniZip$(ConfigurationName)\Tmp"
110 ConfigurationType="1" 110 ConfigurationType="1"
111 InheritedPropertySheets="UpgradeFromVC70.vsprops" 111 InheritedPropertySheets="UpgradeFromVC70.vsprops"
112 CharacterSet="2" 112 CharacterSet="2"
@@ -125,17 +125,19 @@
125 /> 125 />
126 <Tool 126 <Tool
127 Name="VCMIDLTool" 127 Name="VCMIDLTool"
128 TargetEnvironment="3"
129 /> 128 />
130 <Tool 129 <Tool
131 Name="VCCLCompilerTool" 130 Name="VCCLCompilerTool"
132 Optimization="0" 131 Optimization="2"
132 InlineFunctionExpansion="1"
133 OmitFramePointers="true"
133 AdditionalIncludeDirectories="..\..\..;..\..\minizip" 134 AdditionalIncludeDirectories="..\..\..;..\..\minizip"
134 PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64" 135 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"
135 MinimalRebuild="true" 136 StringPooling="true"
136 BasicRuntimeChecks="0" 137 BasicRuntimeChecks="0"
137 RuntimeLibrary="3" 138 RuntimeLibrary="0"
138 BufferSecurityCheck="false" 139 BufferSecurityCheck="false"
140 EnableFunctionLevelLinking="true"
139 UsePrecompiledHeader="0" 141 UsePrecompiledHeader="0"
140 AssemblerListingLocation="$(IntDir)\" 142 AssemblerListingLocation="$(IntDir)\"
141 WarningLevel="3" 143 WarningLevel="3"
@@ -153,14 +155,17 @@
153 /> 155 />
154 <Tool 156 <Tool
155 Name="VCLinkerTool" 157 Name="VCLinkerTool"
156 AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib" 158 AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"
157 OutputFile="$(OutDir)/minizip.exe" 159 OutputFile="$(OutDir)/minizip.exe"
158 LinkIncremental="2" 160 LinkIncremental="1"
159 GenerateManifest="false"
160 GenerateDebugInformation="true" 161 GenerateDebugInformation="true"
161 ProgramDatabaseFile="$(OutDir)/minizip.pdb"
162 SubSystem="1" 162 SubSystem="1"
163 TargetMachine="17" 163 OptimizeReferences="2"
164 EnableCOMDATFolding="2"
165 OptimizeForWindows98="1"
166 RandomizedBaseAddress="1"
167 DataExecutionPrevention="0"
168 TargetMachine="1"
164 /> 169 />
165 <Tool 170 <Tool
166 Name="VCALinkTool" 171 Name="VCALinkTool"
@@ -181,16 +186,13 @@
181 Name="VCAppVerifierTool" 186 Name="VCAppVerifierTool"
182 /> 187 />
183 <Tool 188 <Tool
184 Name="VCWebDeploymentTool"
185 />
186 <Tool
187 Name="VCPostBuildEventTool" 189 Name="VCPostBuildEventTool"
188 /> 190 />
189 </Configuration> 191 </Configuration>
190 <Configuration 192 <Configuration
191 Name="Debug|Itanium" 193 Name="Debug|x64"
192 OutputDirectory="ia64\$(ConfigurationName)" 194 OutputDirectory="x64\$(ConfigurationName)"
193 IntermediateDirectory="ia64\$(ConfigurationName)" 195 IntermediateDirectory="x64\$(ConfigurationName)"
194 ConfigurationType="1" 196 ConfigurationType="1"
195 InheritedPropertySheets="UpgradeFromVC70.vsprops" 197 InheritedPropertySheets="UpgradeFromVC70.vsprops"
196 CharacterSet="2" 198 CharacterSet="2"
@@ -209,7 +211,7 @@
209 /> 211 />
210 <Tool 212 <Tool
211 Name="VCMIDLTool" 213 Name="VCMIDLTool"
212 TargetEnvironment="2" 214 TargetEnvironment="3"
213 /> 215 />
214 <Tool 216 <Tool
215 Name="VCCLCompilerTool" 217 Name="VCCLCompilerTool"
@@ -237,14 +239,14 @@
237 /> 239 />
238 <Tool 240 <Tool
239 Name="VCLinkerTool" 241 Name="VCLinkerTool"
240 AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib" 242 AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"
241 OutputFile="$(OutDir)/minizip.exe" 243 OutputFile="$(OutDir)/minizip.exe"
242 LinkIncremental="2" 244 LinkIncremental="2"
243 GenerateManifest="false" 245 GenerateManifest="false"
244 GenerateDebugInformation="true" 246 GenerateDebugInformation="true"
245 ProgramDatabaseFile="$(OutDir)/minizip.pdb" 247 ProgramDatabaseFile="$(OutDir)/minizip.pdb"
246 SubSystem="1" 248 SubSystem="1"
247 TargetMachine="5" 249 TargetMachine="17"
248 /> 250 />
249 <Tool 251 <Tool
250 Name="VCALinkTool" 252 Name="VCALinkTool"
@@ -272,9 +274,9 @@
272 /> 274 />
273 </Configuration> 275 </Configuration>
274 <Configuration 276 <Configuration
275 Name="Release|Win32" 277 Name="Debug|Itanium"
276 OutputDirectory="x86\MiniZip$(ConfigurationName)" 278 OutputDirectory="ia64\$(ConfigurationName)"
277 IntermediateDirectory="x86\MiniZip$(ConfigurationName)\Tmp" 279 IntermediateDirectory="ia64\$(ConfigurationName)"
278 ConfigurationType="1" 280 ConfigurationType="1"
279 InheritedPropertySheets="UpgradeFromVC70.vsprops" 281 InheritedPropertySheets="UpgradeFromVC70.vsprops"
280 CharacterSet="2" 282 CharacterSet="2"
@@ -293,19 +295,17 @@
293 /> 295 />
294 <Tool 296 <Tool
295 Name="VCMIDLTool" 297 Name="VCMIDLTool"
298 TargetEnvironment="2"
296 /> 299 />
297 <Tool 300 <Tool
298 Name="VCCLCompilerTool" 301 Name="VCCLCompilerTool"
299 Optimization="2" 302 Optimization="0"
300 InlineFunctionExpansion="1"
301 OmitFramePointers="true"
302 AdditionalIncludeDirectories="..\..\..;..\..\minizip" 303 AdditionalIncludeDirectories="..\..\..;..\..\minizip"
303 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE" 304 PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
304 StringPooling="true" 305 MinimalRebuild="true"
305 BasicRuntimeChecks="0" 306 BasicRuntimeChecks="0"
306 RuntimeLibrary="0" 307 RuntimeLibrary="3"
307 BufferSecurityCheck="false" 308 BufferSecurityCheck="false"
308 EnableFunctionLevelLinking="true"
309 UsePrecompiledHeader="0" 309 UsePrecompiledHeader="0"
310 AssemblerListingLocation="$(IntDir)\" 310 AssemblerListingLocation="$(IntDir)\"
311 WarningLevel="3" 311 WarningLevel="3"
@@ -323,15 +323,14 @@
323 /> 323 />
324 <Tool 324 <Tool
325 Name="VCLinkerTool" 325 Name="VCLinkerTool"
326 AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib" 326 AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"
327 OutputFile="$(OutDir)/minizip.exe" 327 OutputFile="$(OutDir)/minizip.exe"
328 LinkIncremental="1" 328 LinkIncremental="2"
329 GenerateManifest="false"
329 GenerateDebugInformation="true" 330 GenerateDebugInformation="true"
331 ProgramDatabaseFile="$(OutDir)/minizip.pdb"
330 SubSystem="1" 332 SubSystem="1"
331 OptimizeReferences="2" 333 TargetMachine="5"
332 EnableCOMDATFolding="2"
333 OptimizeForWindows98="1"
334 TargetMachine="1"
335 /> 334 />
336 <Tool 335 <Tool
337 Name="VCALinkTool" 336 Name="VCALinkTool"
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
diff --git a/contrib/vstudio/vc8/testzlibdll.vcproj b/contrib/vstudio/vc9/testzlibdll.vcproj
index f38ab5e..b1ddde0 100644
--- a/contrib/vstudio/vc8/testzlibdll.vcproj
+++ b/contrib/vstudio/vc9/testzlibdll.vcproj
@@ -1,11 +1,11 @@
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="TestZlibDll" 5 Name="TestZlibDll"
6 ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694366A}" 6 ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
7 Keyword="Win32Proj" 7 Keyword="Win32Proj"
8 SignManifests="true" 8 TargetFrameworkVersion="131072"
9 > 9 >
10 <Platforms> 10 <Platforms>
11 <Platform 11 <Platform
@@ -77,6 +77,8 @@
77 GenerateDebugInformation="true" 77 GenerateDebugInformation="true"
78 ProgramDatabaseFile="$(OutDir)/testzlib.pdb" 78 ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
79 SubSystem="1" 79 SubSystem="1"
80 RandomizedBaseAddress="1"
81 DataExecutionPrevention="0"
80 TargetMachine="1" 82 TargetMachine="1"
81 /> 83 />
82 <Tool 84 <Tool
@@ -98,16 +100,13 @@
98 Name="VCAppVerifierTool" 100 Name="VCAppVerifierTool"
99 /> 101 />
100 <Tool 102 <Tool
101 Name="VCWebDeploymentTool"
102 />
103 <Tool
104 Name="VCPostBuildEventTool" 103 Name="VCPostBuildEventTool"
105 /> 104 />
106 </Configuration> 105 </Configuration>
107 <Configuration 106 <Configuration
108 Name="Debug|x64" 107 Name="Release|Win32"
109 OutputDirectory="x64\TestZlibDll$(ConfigurationName)" 108 OutputDirectory="x86\TestZlibDll$(ConfigurationName)"
110 IntermediateDirectory="x64\TestZlibDll$(ConfigurationName)\Tmp" 109 IntermediateDirectory="x86\TestZlibDll$(ConfigurationName)\Tmp"
111 ConfigurationType="1" 110 ConfigurationType="1"
112 InheritedPropertySheets="UpgradeFromVC70.vsprops" 111 InheritedPropertySheets="UpgradeFromVC70.vsprops"
113 CharacterSet="2" 112 CharacterSet="2"
@@ -126,17 +125,19 @@
126 /> 125 />
127 <Tool 126 <Tool
128 Name="VCMIDLTool" 127 Name="VCMIDLTool"
129 TargetEnvironment="3"
130 /> 128 />
131 <Tool 129 <Tool
132 Name="VCCLCompilerTool" 130 Name="VCCLCompilerTool"
133 Optimization="0" 131 Optimization="2"
132 InlineFunctionExpansion="1"
133 OmitFramePointers="true"
134 AdditionalIncludeDirectories="..\..\..;..\..\minizip" 134 AdditionalIncludeDirectories="..\..\..;..\..\minizip"
135 PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64" 135 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"
136 MinimalRebuild="true" 136 StringPooling="true"
137 BasicRuntimeChecks="0" 137 BasicRuntimeChecks="0"
138 RuntimeLibrary="3" 138 RuntimeLibrary="0"
139 BufferSecurityCheck="false" 139 BufferSecurityCheck="false"
140 EnableFunctionLevelLinking="true"
140 UsePrecompiledHeader="0" 141 UsePrecompiledHeader="0"
141 AssemblerListingLocation="$(IntDir)\" 142 AssemblerListingLocation="$(IntDir)\"
142 WarningLevel="3" 143 WarningLevel="3"
@@ -154,14 +155,18 @@
154 /> 155 />
155 <Tool 156 <Tool
156 Name="VCLinkerTool" 157 Name="VCLinkerTool"
157 AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib" 158 AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"
158 OutputFile="$(OutDir)/testzlib.exe" 159 OutputFile="$(OutDir)/testzlib.exe"
159 LinkIncremental="2" 160 LinkIncremental="1"
160 GenerateManifest="false" 161 GenerateManifest="false"
161 GenerateDebugInformation="true" 162 GenerateDebugInformation="true"
162 ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
163 SubSystem="1" 163 SubSystem="1"
164 TargetMachine="17" 164 OptimizeReferences="2"
165 EnableCOMDATFolding="2"
166 OptimizeForWindows98="1"
167 RandomizedBaseAddress="1"
168 DataExecutionPrevention="0"
169 TargetMachine="1"
165 /> 170 />
166 <Tool 171 <Tool
167 Name="VCALinkTool" 172 Name="VCALinkTool"
@@ -182,16 +187,13 @@
182 Name="VCAppVerifierTool" 187 Name="VCAppVerifierTool"
183 /> 188 />
184 <Tool 189 <Tool
185 Name="VCWebDeploymentTool"
186 />
187 <Tool
188 Name="VCPostBuildEventTool" 190 Name="VCPostBuildEventTool"
189 /> 191 />
190 </Configuration> 192 </Configuration>
191 <Configuration 193 <Configuration
192 Name="Debug|Itanium" 194 Name="Debug|x64"
193 OutputDirectory="ia64\TestZlibDll$(ConfigurationName)" 195 OutputDirectory="x64\TestZlibDll$(ConfigurationName)"
194 IntermediateDirectory="ia64\TestZlibDll$(ConfigurationName)\Tmp" 196 IntermediateDirectory="x64\TestZlibDll$(ConfigurationName)\Tmp"
195 ConfigurationType="1" 197 ConfigurationType="1"
196 InheritedPropertySheets="UpgradeFromVC70.vsprops" 198 InheritedPropertySheets="UpgradeFromVC70.vsprops"
197 CharacterSet="2" 199 CharacterSet="2"
@@ -210,7 +212,7 @@
210 /> 212 />
211 <Tool 213 <Tool
212 Name="VCMIDLTool" 214 Name="VCMIDLTool"
213 TargetEnvironment="2" 215 TargetEnvironment="3"
214 /> 216 />
215 <Tool 217 <Tool
216 Name="VCCLCompilerTool" 218 Name="VCCLCompilerTool"
@@ -238,14 +240,14 @@
238 /> 240 />
239 <Tool 241 <Tool
240 Name="VCLinkerTool" 242 Name="VCLinkerTool"
241 AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib" 243 AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"
242 OutputFile="$(OutDir)/testzlib.exe" 244 OutputFile="$(OutDir)/testzlib.exe"
243 LinkIncremental="2" 245 LinkIncremental="2"
244 GenerateManifest="false" 246 GenerateManifest="false"
245 GenerateDebugInformation="true" 247 GenerateDebugInformation="true"
246 ProgramDatabaseFile="$(OutDir)/testzlib.pdb" 248 ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
247 SubSystem="1" 249 SubSystem="1"
248 TargetMachine="5" 250 TargetMachine="17"
249 /> 251 />
250 <Tool 252 <Tool
251 Name="VCALinkTool" 253 Name="VCALinkTool"
@@ -273,9 +275,9 @@
273 /> 275 />
274 </Configuration> 276 </Configuration>
275 <Configuration 277 <Configuration
276 Name="Release|Win32" 278 Name="Debug|Itanium"
277 OutputDirectory="x86\TestZlibDll$(ConfigurationName)" 279 OutputDirectory="ia64\TestZlibDll$(ConfigurationName)"
278 IntermediateDirectory="x86\TestZlibDll$(ConfigurationName)\Tmp" 280 IntermediateDirectory="ia64\TestZlibDll$(ConfigurationName)\Tmp"
279 ConfigurationType="1" 281 ConfigurationType="1"
280 InheritedPropertySheets="UpgradeFromVC70.vsprops" 282 InheritedPropertySheets="UpgradeFromVC70.vsprops"
281 CharacterSet="2" 283 CharacterSet="2"
@@ -294,19 +296,17 @@
294 /> 296 />
295 <Tool 297 <Tool
296 Name="VCMIDLTool" 298 Name="VCMIDLTool"
299 TargetEnvironment="2"
297 /> 300 />
298 <Tool 301 <Tool
299 Name="VCCLCompilerTool" 302 Name="VCCLCompilerTool"
300 Optimization="2" 303 Optimization="0"
301 InlineFunctionExpansion="1"
302 OmitFramePointers="true"
303 AdditionalIncludeDirectories="..\..\..;..\..\minizip" 304 AdditionalIncludeDirectories="..\..\..;..\..\minizip"
304 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE" 305 PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
305 StringPooling="true" 306 MinimalRebuild="true"
306 BasicRuntimeChecks="0" 307 BasicRuntimeChecks="0"
307 RuntimeLibrary="0" 308 RuntimeLibrary="3"
308 BufferSecurityCheck="false" 309 BufferSecurityCheck="false"
309 EnableFunctionLevelLinking="true"
310 UsePrecompiledHeader="0" 310 UsePrecompiledHeader="0"
311 AssemblerListingLocation="$(IntDir)\" 311 AssemblerListingLocation="$(IntDir)\"
312 WarningLevel="3" 312 WarningLevel="3"
@@ -324,16 +324,14 @@
324 /> 324 />
325 <Tool 325 <Tool
326 Name="VCLinkerTool" 326 Name="VCLinkerTool"
327 AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib" 327 AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"
328 OutputFile="$(OutDir)/testzlib.exe" 328 OutputFile="$(OutDir)/testzlib.exe"
329 LinkIncremental="1" 329 LinkIncremental="2"
330 GenerateManifest="false" 330 GenerateManifest="false"
331 GenerateDebugInformation="true" 331 GenerateDebugInformation="true"
332 ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
332 SubSystem="1" 333 SubSystem="1"
333 OptimizeReferences="2" 334 TargetMachine="5"
334 EnableCOMDATFolding="2"
335 OptimizeForWindows98="1"
336 TargetMachine="1"
337 /> 335 />
338 <Tool 336 <Tool
339 Name="VCALinkTool" 337 Name="VCALinkTool"
diff --git a/contrib/vstudio/vc8/zlibstat.vcproj b/contrib/vstudio/vc9/zlibstat.vcproj
index 51a4073..ff9813a 100644
--- a/contrib/vstudio/vc8/zlibstat.vcproj
+++ b/contrib/vstudio/vc9/zlibstat.vcproj
@@ -1,9 +1,10 @@
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="zlibstat" 5 Name="zlibstat"
6 ProjectGUID="{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}" 6 ProjectGUID="{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
7 TargetFrameworkVersion="131072"
7 > 8 >
8 <Platforms> 9 <Platforms>
9 <Platform 10 <Platform
@@ -47,7 +48,7 @@
47 Name="VCCLCompilerTool" 48 Name="VCCLCompilerTool"
48 Optimization="0" 49 Optimization="0"
49 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 50 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
50 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" 51 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
51 ExceptionHandling="0" 52 ExceptionHandling="0"
52 RuntimeLibrary="1" 53 RuntimeLibrary="1"
53 BufferSecurityCheck="false" 54 BufferSecurityCheck="false"
@@ -93,9 +94,9 @@
93 /> 94 />
94 </Configuration> 95 </Configuration>
95 <Configuration 96 <Configuration
96 Name="Debug|x64" 97 Name="Release|Win32"
97 OutputDirectory="x64\ZlibStat$(ConfigurationName)" 98 OutputDirectory="x86\ZlibStat$(ConfigurationName)"
98 IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp" 99 IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"
99 ConfigurationType="4" 100 ConfigurationType="4"
100 InheritedPropertySheets="UpgradeFromVC70.vsprops" 101 InheritedPropertySheets="UpgradeFromVC70.vsprops"
101 UseOfMFC="0" 102 UseOfMFC="0"
@@ -115,24 +116,23 @@
115 /> 116 />
116 <Tool 117 <Tool
117 Name="VCMIDLTool" 118 Name="VCMIDLTool"
118 TargetEnvironment="3"
119 /> 119 />
120 <Tool 120 <Tool
121 Name="VCCLCompilerTool" 121 Name="VCCLCompilerTool"
122 Optimization="0" 122 InlineFunctionExpansion="1"
123 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 123 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
124 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" 124 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF"
125 StringPooling="true"
125 ExceptionHandling="0" 126 ExceptionHandling="0"
126 RuntimeLibrary="3" 127 RuntimeLibrary="0"
127 BufferSecurityCheck="false" 128 BufferSecurityCheck="false"
129 EnableFunctionLevelLinking="true"
128 PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" 130 PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
129 AssemblerListingLocation="$(IntDir)\" 131 AssemblerListingLocation="$(IntDir)\"
130 ObjectFile="$(IntDir)\" 132 ObjectFile="$(IntDir)\"
131 ProgramDataBaseFileName="$(OutDir)\" 133 ProgramDataBaseFileName="$(OutDir)\"
132 WarningLevel="3" 134 WarningLevel="3"
133 SuppressStartupBanner="true" 135 SuppressStartupBanner="true"
134 Detect64BitPortabilityProblems="true"
135 DebugInformationFormat="1"
136 /> 136 />
137 <Tool 137 <Tool
138 Name="VCManagedResourceCompilerTool" 138 Name="VCManagedResourceCompilerTool"
@@ -146,7 +146,8 @@
146 /> 146 />
147 <Tool 147 <Tool
148 Name="VCLibrarianTool" 148 Name="VCLibrarianTool"
149 AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB" 149 AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"
150 AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj "
150 OutputFile="$(OutDir)\zlibstat.lib" 151 OutputFile="$(OutDir)\zlibstat.lib"
151 SuppressStartupBanner="true" 152 SuppressStartupBanner="true"
152 /> 153 />
@@ -167,9 +168,9 @@
167 /> 168 />
168 </Configuration> 169 </Configuration>
169 <Configuration 170 <Configuration
170 Name="Debug|Itanium" 171 Name="ReleaseWithoutAsm|Win32"
171 OutputDirectory="ia64\ZlibStat$(ConfigurationName)" 172 OutputDirectory="x86\ZlibStat$(ConfigurationName)"
172 IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp" 173 IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"
173 ConfigurationType="4" 174 ConfigurationType="4"
174 InheritedPropertySheets="UpgradeFromVC70.vsprops" 175 InheritedPropertySheets="UpgradeFromVC70.vsprops"
175 UseOfMFC="0" 176 UseOfMFC="0"
@@ -189,24 +190,23 @@
189 /> 190 />
190 <Tool 191 <Tool
191 Name="VCMIDLTool" 192 Name="VCMIDLTool"
192 TargetEnvironment="2"
193 /> 193 />
194 <Tool 194 <Tool
195 Name="VCCLCompilerTool" 195 Name="VCCLCompilerTool"
196 Optimization="0" 196 InlineFunctionExpansion="1"
197 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 197 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
198 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" 198 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
199 StringPooling="true"
199 ExceptionHandling="0" 200 ExceptionHandling="0"
200 RuntimeLibrary="3" 201 RuntimeLibrary="0"
201 BufferSecurityCheck="false" 202 BufferSecurityCheck="false"
203 EnableFunctionLevelLinking="true"
202 PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" 204 PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
203 AssemblerListingLocation="$(IntDir)\" 205 AssemblerListingLocation="$(IntDir)\"
204 ObjectFile="$(IntDir)\" 206 ObjectFile="$(IntDir)\"
205 ProgramDataBaseFileName="$(OutDir)\" 207 ProgramDataBaseFileName="$(OutDir)\"
206 WarningLevel="3" 208 WarningLevel="3"
207 SuppressStartupBanner="true" 209 SuppressStartupBanner="true"
208 Detect64BitPortabilityProblems="true"
209 DebugInformationFormat="1"
210 /> 210 />
211 <Tool 211 <Tool
212 Name="VCManagedResourceCompilerTool" 212 Name="VCManagedResourceCompilerTool"
@@ -220,7 +220,7 @@
220 /> 220 />
221 <Tool 221 <Tool
222 Name="VCLibrarianTool" 222 Name="VCLibrarianTool"
223 AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB" 223 AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"
224 OutputFile="$(OutDir)\zlibstat.lib" 224 OutputFile="$(OutDir)\zlibstat.lib"
225 SuppressStartupBanner="true" 225 SuppressStartupBanner="true"
226 /> 226 />
@@ -241,9 +241,9 @@
241 /> 241 />
242 </Configuration> 242 </Configuration>
243 <Configuration 243 <Configuration
244 Name="Release|Win32" 244 Name="Debug|x64"
245 OutputDirectory="x86\ZlibStat$(ConfigurationName)" 245 OutputDirectory="x64\ZlibStat$(ConfigurationName)"
246 IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp" 246 IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp"
247 ConfigurationType="4" 247 ConfigurationType="4"
248 InheritedPropertySheets="UpgradeFromVC70.vsprops" 248 InheritedPropertySheets="UpgradeFromVC70.vsprops"
249 UseOfMFC="0" 249 UseOfMFC="0"
@@ -263,23 +263,24 @@
263 /> 263 />
264 <Tool 264 <Tool
265 Name="VCMIDLTool" 265 Name="VCMIDLTool"
266 TargetEnvironment="3"
266 /> 267 />
267 <Tool 268 <Tool
268 Name="VCCLCompilerTool" 269 Name="VCCLCompilerTool"
269 InlineFunctionExpansion="1" 270 Optimization="0"
270 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 271 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
271 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ASMV;ASMINF" 272 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
272 StringPooling="true"
273 ExceptionHandling="0" 273 ExceptionHandling="0"
274 RuntimeLibrary="0" 274 RuntimeLibrary="3"
275 BufferSecurityCheck="false" 275 BufferSecurityCheck="false"
276 EnableFunctionLevelLinking="true"
277 PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" 276 PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
278 AssemblerListingLocation="$(IntDir)\" 277 AssemblerListingLocation="$(IntDir)\"
279 ObjectFile="$(IntDir)\" 278 ObjectFile="$(IntDir)\"
280 ProgramDataBaseFileName="$(OutDir)\" 279 ProgramDataBaseFileName="$(OutDir)\"
281 WarningLevel="3" 280 WarningLevel="3"
282 SuppressStartupBanner="true" 281 SuppressStartupBanner="true"
282 Detect64BitPortabilityProblems="true"
283 DebugInformationFormat="1"
283 /> 284 />
284 <Tool 285 <Tool
285 Name="VCManagedResourceCompilerTool" 286 Name="VCManagedResourceCompilerTool"
@@ -293,8 +294,7 @@
293 /> 294 />
294 <Tool 295 <Tool
295 Name="VCLibrarianTool" 296 Name="VCLibrarianTool"
296 AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB" 297 AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"
297 AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj "
298 OutputFile="$(OutDir)\zlibstat.lib" 298 OutputFile="$(OutDir)\zlibstat.lib"
299 SuppressStartupBanner="true" 299 SuppressStartupBanner="true"
300 /> 300 />
@@ -315,9 +315,9 @@
315 /> 315 />
316 </Configuration> 316 </Configuration>
317 <Configuration 317 <Configuration
318 Name="Release|x64" 318 Name="Debug|Itanium"
319 OutputDirectory="x64\ZlibStat$(ConfigurationName)" 319 OutputDirectory="ia64\ZlibStat$(ConfigurationName)"
320 IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp" 320 IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp"
321 ConfigurationType="4" 321 ConfigurationType="4"
322 InheritedPropertySheets="UpgradeFromVC70.vsprops" 322 InheritedPropertySheets="UpgradeFromVC70.vsprops"
323 UseOfMFC="0" 323 UseOfMFC="0"
@@ -337,24 +337,24 @@
337 /> 337 />
338 <Tool 338 <Tool
339 Name="VCMIDLTool" 339 Name="VCMIDLTool"
340 TargetEnvironment="3" 340 TargetEnvironment="2"
341 /> 341 />
342 <Tool 342 <Tool
343 Name="VCCLCompilerTool" 343 Name="VCCLCompilerTool"
344 InlineFunctionExpansion="1" 344 Optimization="0"
345 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 345 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
346 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ASMV;ASMINF;WIN64" 346 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
347 StringPooling="true"
348 ExceptionHandling="0" 347 ExceptionHandling="0"
349 RuntimeLibrary="2" 348 RuntimeLibrary="3"
350 BufferSecurityCheck="false" 349 BufferSecurityCheck="false"
351 EnableFunctionLevelLinking="true"
352 PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" 350 PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
353 AssemblerListingLocation="$(IntDir)\" 351 AssemblerListingLocation="$(IntDir)\"
354 ObjectFile="$(IntDir)\" 352 ObjectFile="$(IntDir)\"
355 ProgramDataBaseFileName="$(OutDir)\" 353 ProgramDataBaseFileName="$(OutDir)\"
356 WarningLevel="3" 354 WarningLevel="3"
357 SuppressStartupBanner="true" 355 SuppressStartupBanner="true"
356 Detect64BitPortabilityProblems="true"
357 DebugInformationFormat="1"
358 /> 358 />
359 <Tool 359 <Tool
360 Name="VCManagedResourceCompilerTool" 360 Name="VCManagedResourceCompilerTool"
@@ -368,8 +368,7 @@
368 /> 368 />
369 <Tool 369 <Tool
370 Name="VCLibrarianTool" 370 Name="VCLibrarianTool"
371 AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB" 371 AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB"
372 AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "
373 OutputFile="$(OutDir)\zlibstat.lib" 372 OutputFile="$(OutDir)\zlibstat.lib"
374 SuppressStartupBanner="true" 373 SuppressStartupBanner="true"
375 /> 374 />
@@ -390,9 +389,9 @@
390 /> 389 />
391 </Configuration> 390 </Configuration>
392 <Configuration 391 <Configuration
393 Name="Release|Itanium" 392 Name="Release|x64"
394 OutputDirectory="ia64\ZlibStat$(ConfigurationName)" 393 OutputDirectory="x64\ZlibStat$(ConfigurationName)"
395 IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp" 394 IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp"
396 ConfigurationType="4" 395 ConfigurationType="4"
397 InheritedPropertySheets="UpgradeFromVC70.vsprops" 396 InheritedPropertySheets="UpgradeFromVC70.vsprops"
398 UseOfMFC="0" 397 UseOfMFC="0"
@@ -412,13 +411,13 @@
412 /> 411 />
413 <Tool 412 <Tool
414 Name="VCMIDLTool" 413 Name="VCMIDLTool"
415 TargetEnvironment="2" 414 TargetEnvironment="3"
416 /> 415 />
417 <Tool 416 <Tool
418 Name="VCCLCompilerTool" 417 Name="VCCLCompilerTool"
419 InlineFunctionExpansion="1" 418 InlineFunctionExpansion="1"
420 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 419 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
421 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" 420 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64"
422 StringPooling="true" 421 StringPooling="true"
423 ExceptionHandling="0" 422 ExceptionHandling="0"
424 RuntimeLibrary="2" 423 RuntimeLibrary="2"
@@ -443,7 +442,8 @@
443 /> 442 />
444 <Tool 443 <Tool
445 Name="VCLibrarianTool" 444 Name="VCLibrarianTool"
446 AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB" 445 AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"
446 AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "
447 OutputFile="$(OutDir)\zlibstat.lib" 447 OutputFile="$(OutDir)\zlibstat.lib"
448 SuppressStartupBanner="true" 448 SuppressStartupBanner="true"
449 /> 449 />
@@ -464,9 +464,9 @@
464 /> 464 />
465 </Configuration> 465 </Configuration>
466 <Configuration 466 <Configuration
467 Name="ReleaseWithoutAsm|Win32" 467 Name="Release|Itanium"
468 OutputDirectory="x86\ZlibStat$(ConfigurationName)" 468 OutputDirectory="ia64\ZlibStat$(ConfigurationName)"
469 IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp" 469 IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp"
470 ConfigurationType="4" 470 ConfigurationType="4"
471 InheritedPropertySheets="UpgradeFromVC70.vsprops" 471 InheritedPropertySheets="UpgradeFromVC70.vsprops"
472 UseOfMFC="0" 472 UseOfMFC="0"
@@ -486,15 +486,16 @@
486 /> 486 />
487 <Tool 487 <Tool
488 Name="VCMIDLTool" 488 Name="VCMIDLTool"
489 TargetEnvironment="2"
489 /> 490 />
490 <Tool 491 <Tool
491 Name="VCCLCompilerTool" 492 Name="VCCLCompilerTool"
492 InlineFunctionExpansion="1" 493 InlineFunctionExpansion="1"
493 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 494 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
494 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" 495 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
495 StringPooling="true" 496 StringPooling="true"
496 ExceptionHandling="0" 497 ExceptionHandling="0"
497 RuntimeLibrary="0" 498 RuntimeLibrary="2"
498 BufferSecurityCheck="false" 499 BufferSecurityCheck="false"
499 EnableFunctionLevelLinking="true" 500 EnableFunctionLevelLinking="true"
500 PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" 501 PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
@@ -516,7 +517,7 @@
516 /> 517 />
517 <Tool 518 <Tool
518 Name="VCLibrarianTool" 519 Name="VCLibrarianTool"
519 AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB" 520 AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB"
520 OutputFile="$(OutDir)\zlibstat.lib" 521 OutputFile="$(OutDir)\zlibstat.lib"
521 SuppressStartupBanner="true" 522 SuppressStartupBanner="true"
522 /> 523 />
@@ -565,7 +566,7 @@
565 Name="VCCLCompilerTool" 566 Name="VCCLCompilerTool"
566 InlineFunctionExpansion="1" 567 InlineFunctionExpansion="1"
567 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 568 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
568 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" 569 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
569 StringPooling="true" 570 StringPooling="true"
570 ExceptionHandling="0" 571 ExceptionHandling="0"
571 RuntimeLibrary="2" 572 RuntimeLibrary="2"
@@ -639,7 +640,7 @@
639 Name="VCCLCompilerTool" 640 Name="VCCLCompilerTool"
640 InlineFunctionExpansion="1" 641 InlineFunctionExpansion="1"
641 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 642 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
642 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" 643 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
643 StringPooling="true" 644 StringPooling="true"
644 ExceptionHandling="0" 645 ExceptionHandling="0"
645 RuntimeLibrary="2" 646 RuntimeLibrary="2"
@@ -760,19 +761,24 @@
760 </FileConfiguration> 761 </FileConfiguration>
761 </File> 762 </File>
762 <File 763 <File
763 RelativePath="..\..\..\gzclose.c"> 764 RelativePath="..\..\..\gzclose.c"
765 >
764 </File> 766 </File>
765 <File 767 <File
766 RelativePath="..\..\..\gzio.c"> 768 RelativePath="..\..\..\gzio.c"
769 >
767 </File> 770 </File>
768 <File 771 <File
769 RelativePath="..\..\..\gzlib.c"> 772 RelativePath="..\..\..\gzlib.c"
773 >
770 </File> 774 </File>
771 <File 775 <File
772 RelativePath="..\..\..\gzread.c"> 776 RelativePath="..\..\..\gzread.c"
777 >
773 </File> 778 </File>
774 <File 779 <File
775 RelativePath="..\..\..\gzwrite.c"> 780 RelativePath="..\..\..\gzwrite.c"
781 >
776 </File> 782 </File>
777 <File 783 <File
778 RelativePath="..\..\..\infback.c" 784 RelativePath="..\..\..\infback.c"
@@ -790,7 +796,7 @@
790 /> 796 />
791 </FileConfiguration> 797 </FileConfiguration>
792 <FileConfiguration 798 <FileConfiguration
793 Name="Debug|Itanium" 799 Name="Release|Win32"
794 ExcludedFromBuild="true" 800 ExcludedFromBuild="true"
795 > 801 >
796 <Tool 802 <Tool
@@ -798,7 +804,7 @@
798 /> 804 />
799 </FileConfiguration> 805 </FileConfiguration>
800 <FileConfiguration 806 <FileConfiguration
801 Name="Release|Win32" 807 Name="ReleaseWithoutAsm|Win32"
802 ExcludedFromBuild="true" 808 ExcludedFromBuild="true"
803 > 809 >
804 <Tool 810 <Tool
@@ -806,7 +812,7 @@
806 /> 812 />
807 </FileConfiguration> 813 </FileConfiguration>
808 <FileConfiguration 814 <FileConfiguration
809 Name="Release|Itanium" 815 Name="Debug|Itanium"
810 ExcludedFromBuild="true" 816 ExcludedFromBuild="true"
811 > 817 >
812 <Tool 818 <Tool
@@ -814,7 +820,7 @@
814 /> 820 />
815 </FileConfiguration> 821 </FileConfiguration>
816 <FileConfiguration 822 <FileConfiguration
817 Name="ReleaseWithoutAsm|Win32" 823 Name="Release|Itanium"
818 ExcludedFromBuild="true" 824 ExcludedFromBuild="true"
819 > 825 >
820 <Tool 826 <Tool
diff --git a/contrib/vstudio/vc8/zlibvc.sln b/contrib/vstudio/vc9/zlibvc.sln
index a815a55..c7f1b0b 100644
--- a/contrib/vstudio/vc8/zlibvc.sln
+++ b/contrib/vstudio/vc9/zlibvc.sln
@@ -1,6 +1,6 @@
1 1
2Microsoft Visual Studio Solution File, Format Version 9.00 2Microsoft Visual Studio Solution File, Format Version 10.00
3# Visual Studio 2005 3# Visual Studio 2008
4Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}" 4Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
5EndProject 5EndProject
6Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}" 6Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-20 21:55:13 +0000