diff options
author | Mark Adler <fork@madler.net> | 2022-10-06 12:52:49 -0700 |
---|---|---|
committer | Mark Adler <fork@madler.net> | 2022-10-06 20:43:09 -0700 |
commit | d0704a820186481da35d08f4b655881e1d32089f (patch) | |
tree | 6b4365d354376de1e2fd10f1687e2daf48efb73a /contrib/vstudio/vc9 | |
parent | 095da07753035a2b80654553e1cad92d1dee1481 (diff) | |
download | zlib-d0704a820186481da35d08f4b655881e1d32089f.tar.gz zlib-d0704a820186481da35d08f4b655881e1d32089f.tar.bz2 zlib-d0704a820186481da35d08f4b655881e1d32089f.zip |
Remove deleted assembler code references.
The code was removed, but the builds that used the code were not
updated. This fixes that. Thanks to Adenilson and toxieainc for
the patches.
Diffstat (limited to 'contrib/vstudio/vc9')
-rw-r--r-- | contrib/vstudio/vc9/miniunz.vcproj | 2 | ||||
-rw-r--r-- | contrib/vstudio/vc9/minizip.vcproj | 2 | ||||
-rw-r--r-- | contrib/vstudio/vc9/testzlib.vcproj | 66 | ||||
-rw-r--r-- | contrib/vstudio/vc9/testzlibdll.vcproj | 2 | ||||
-rw-r--r-- | contrib/vstudio/vc9/zlibstat.vcproj | 76 | ||||
-rw-r--r-- | contrib/vstudio/vc9/zlibvc.vcproj | 82 |
6 files changed, 32 insertions, 198 deletions
diff --git a/contrib/vstudio/vc9/miniunz.vcproj b/contrib/vstudio/vc9/miniunz.vcproj index 7da32b9..cc3d13a 100644 --- a/contrib/vstudio/vc9/miniunz.vcproj +++ b/contrib/vstudio/vc9/miniunz.vcproj | |||
@@ -542,7 +542,7 @@ | |||
542 | <Files> | 542 | <Files> |
543 | <Filter | 543 | <Filter |
544 | Name="Source Files" | 544 | Name="Source Files" |
545 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" | 545 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat" |
546 | > | 546 | > |
547 | <File | 547 | <File |
548 | RelativePath="..\..\minizip\miniunz.c" | 548 | RelativePath="..\..\minizip\miniunz.c" |
diff --git a/contrib/vstudio/vc9/minizip.vcproj b/contrib/vstudio/vc9/minizip.vcproj index e57e07d..fecd9dd 100644 --- a/contrib/vstudio/vc9/minizip.vcproj +++ b/contrib/vstudio/vc9/minizip.vcproj | |||
@@ -539,7 +539,7 @@ | |||
539 | <Files> | 539 | <Files> |
540 | <Filter | 540 | <Filter |
541 | Name="Source Files" | 541 | Name="Source Files" |
542 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" | 542 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat" |
543 | > | 543 | > |
544 | <File | 544 | <File |
545 | RelativePath="..\..\minizip\minizip.c" | 545 | RelativePath="..\..\minizip\minizip.c" |
diff --git a/contrib/vstudio/vc9/testzlib.vcproj b/contrib/vstudio/vc9/testzlib.vcproj index 9cb0bf8..ff69640 100644 --- a/contrib/vstudio/vc9/testzlib.vcproj +++ b/contrib/vstudio/vc9/testzlib.vcproj | |||
@@ -48,7 +48,7 @@ | |||
48 | Name="VCCLCompilerTool" | 48 | Name="VCCLCompilerTool" |
49 | Optimization="0" | 49 | Optimization="0" |
50 | AdditionalIncludeDirectories="..\..\.." | 50 | AdditionalIncludeDirectories="..\..\.." |
51 | PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" | 51 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
52 | MinimalRebuild="true" | 52 | MinimalRebuild="true" |
53 | BasicRuntimeChecks="0" | 53 | BasicRuntimeChecks="0" |
54 | RuntimeLibrary="1" | 54 | RuntimeLibrary="1" |
@@ -71,7 +71,6 @@ | |||
71 | /> | 71 | /> |
72 | <Tool | 72 | <Tool |
73 | Name="VCLinkerTool" | 73 | Name="VCLinkerTool" |
74 | AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj" | ||
75 | OutputFile="$(OutDir)/testzlib.exe" | 74 | OutputFile="$(OutDir)/testzlib.exe" |
76 | LinkIncremental="2" | 75 | LinkIncremental="2" |
77 | GenerateManifest="false" | 76 | GenerateManifest="false" |
@@ -128,7 +127,7 @@ | |||
128 | <Tool | 127 | <Tool |
129 | Name="VCCLCompilerTool" | 128 | Name="VCCLCompilerTool" |
130 | AdditionalIncludeDirectories="..\..\.." | 129 | AdditionalIncludeDirectories="..\..\.." |
131 | PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" | 130 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
132 | BasicRuntimeChecks="0" | 131 | BasicRuntimeChecks="0" |
133 | RuntimeLibrary="3" | 132 | RuntimeLibrary="3" |
134 | BufferSecurityCheck="false" | 133 | BufferSecurityCheck="false" |
@@ -145,7 +144,6 @@ | |||
145 | /> | 144 | /> |
146 | <Tool | 145 | <Tool |
147 | Name="VCLinkerTool" | 146 | Name="VCLinkerTool" |
148 | AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj" | ||
149 | GenerateManifest="false" | 147 | GenerateManifest="false" |
150 | /> | 148 | /> |
151 | <Tool | 149 | <Tool |
@@ -517,7 +515,7 @@ | |||
517 | InlineFunctionExpansion="1" | 515 | InlineFunctionExpansion="1" |
518 | OmitFramePointers="true" | 516 | OmitFramePointers="true" |
519 | AdditionalIncludeDirectories="..\..\.." | 517 | AdditionalIncludeDirectories="..\..\.." |
520 | PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" | 518 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
521 | StringPooling="true" | 519 | StringPooling="true" |
522 | BasicRuntimeChecks="0" | 520 | BasicRuntimeChecks="0" |
523 | RuntimeLibrary="0" | 521 | RuntimeLibrary="0" |
@@ -540,7 +538,6 @@ | |||
540 | /> | 538 | /> |
541 | <Tool | 539 | <Tool |
542 | Name="VCLinkerTool" | 540 | Name="VCLinkerTool" |
543 | AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj" | ||
544 | OutputFile="$(OutDir)/testzlib.exe" | 541 | OutputFile="$(OutDir)/testzlib.exe" |
545 | LinkIncremental="1" | 542 | LinkIncremental="1" |
546 | GenerateManifest="false" | 543 | GenerateManifest="false" |
@@ -600,7 +597,7 @@ | |||
600 | <Tool | 597 | <Tool |
601 | Name="VCCLCompilerTool" | 598 | Name="VCCLCompilerTool" |
602 | AdditionalIncludeDirectories="..\..\.." | 599 | AdditionalIncludeDirectories="..\..\.." |
603 | PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" | 600 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
604 | BasicRuntimeChecks="0" | 601 | BasicRuntimeChecks="0" |
605 | RuntimeLibrary="0" | 602 | RuntimeLibrary="0" |
606 | BufferSecurityCheck="false" | 603 | BufferSecurityCheck="false" |
@@ -617,7 +614,6 @@ | |||
617 | /> | 614 | /> |
618 | <Tool | 615 | <Tool |
619 | Name="VCLinkerTool" | 616 | Name="VCLinkerTool" |
620 | AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj" | ||
621 | GenerateManifest="false" | 617 | GenerateManifest="false" |
622 | /> | 618 | /> |
623 | <Tool | 619 | <Tool |
@@ -733,7 +729,7 @@ | |||
733 | <Files> | 729 | <Files> |
734 | <Filter | 730 | <Filter |
735 | Name="Source Files" | 731 | Name="Source Files" |
736 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" | 732 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat" |
737 | > | 733 | > |
738 | <File | 734 | <File |
739 | RelativePath="..\..\..\adler32.c" | 735 | RelativePath="..\..\..\adler32.c" |
@@ -756,58 +752,6 @@ | |||
756 | > | 752 | > |
757 | </File> | 753 | </File> |
758 | <File | 754 | <File |
759 | RelativePath="..\..\masmx64\inffas8664.c" | ||
760 | > | ||
761 | <FileConfiguration | ||
762 | Name="Debug|Win32" | ||
763 | ExcludedFromBuild="true" | ||
764 | > | ||
765 | <Tool | ||
766 | Name="VCCLCompilerTool" | ||
767 | /> | ||
768 | </FileConfiguration> | ||
769 | <FileConfiguration | ||
770 | Name="Debug|Itanium" | ||
771 | ExcludedFromBuild="true" | ||
772 | > | ||
773 | <Tool | ||
774 | Name="VCCLCompilerTool" | ||
775 | /> | ||
776 | </FileConfiguration> | ||
777 | <FileConfiguration | ||
778 | Name="ReleaseWithoutAsm|Win32" | ||
779 | ExcludedFromBuild="true" | ||
780 | > | ||
781 | <Tool | ||
782 | Name="VCCLCompilerTool" | ||
783 | /> | ||
784 | </FileConfiguration> | ||
785 | <FileConfiguration | ||
786 | Name="ReleaseWithoutAsm|Itanium" | ||
787 | ExcludedFromBuild="true" | ||
788 | > | ||
789 | <Tool | ||
790 | Name="VCCLCompilerTool" | ||
791 | /> | ||
792 | </FileConfiguration> | ||
793 | <FileConfiguration | ||
794 | Name="Release|Win32" | ||
795 | ExcludedFromBuild="true" | ||
796 | > | ||
797 | <Tool | ||
798 | Name="VCCLCompilerTool" | ||
799 | /> | ||
800 | </FileConfiguration> | ||
801 | <FileConfiguration | ||
802 | Name="Release|Itanium" | ||
803 | ExcludedFromBuild="true" | ||
804 | > | ||
805 | <Tool | ||
806 | Name="VCCLCompilerTool" | ||
807 | /> | ||
808 | </FileConfiguration> | ||
809 | </File> | ||
810 | <File | ||
811 | RelativePath="..\..\..\inffast.c" | 755 | RelativePath="..\..\..\inffast.c" |
812 | > | 756 | > |
813 | </File> | 757 | </File> |
diff --git a/contrib/vstudio/vc9/testzlibdll.vcproj b/contrib/vstudio/vc9/testzlibdll.vcproj index b1ddde0..6448b49 100644 --- a/contrib/vstudio/vc9/testzlibdll.vcproj +++ b/contrib/vstudio/vc9/testzlibdll.vcproj | |||
@@ -542,7 +542,7 @@ | |||
542 | <Files> | 542 | <Files> |
543 | <Filter | 543 | <Filter |
544 | Name="Source Files" | 544 | Name="Source Files" |
545 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" | 545 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat" |
546 | > | 546 | > |
547 | <File | 547 | <File |
548 | RelativePath="..\..\testzlib\testzlib.c" | 548 | RelativePath="..\..\testzlib\testzlib.c" |
diff --git a/contrib/vstudio/vc9/zlibstat.vcproj b/contrib/vstudio/vc9/zlibstat.vcproj index 61c76c7..1bf1563 100644 --- a/contrib/vstudio/vc9/zlibstat.vcproj +++ b/contrib/vstudio/vc9/zlibstat.vcproj | |||
@@ -47,7 +47,7 @@ | |||
47 | <Tool | 47 | <Tool |
48 | Name="VCCLCompilerTool" | 48 | Name="VCCLCompilerTool" |
49 | Optimization="0" | 49 | Optimization="0" |
50 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 50 | AdditionalIncludeDirectories="..\..\.." |
51 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" | 51 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
52 | ExceptionHandling="0" | 52 | ExceptionHandling="0" |
53 | RuntimeLibrary="1" | 53 | RuntimeLibrary="1" |
@@ -121,7 +121,7 @@ | |||
121 | <Tool | 121 | <Tool |
122 | Name="VCCLCompilerTool" | 122 | Name="VCCLCompilerTool" |
123 | Optimization="0" | 123 | Optimization="0" |
124 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 124 | AdditionalIncludeDirectories="..\..\.." |
125 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" | 125 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" |
126 | ExceptionHandling="0" | 126 | ExceptionHandling="0" |
127 | RuntimeLibrary="3" | 127 | RuntimeLibrary="3" |
@@ -195,7 +195,7 @@ | |||
195 | <Tool | 195 | <Tool |
196 | Name="VCCLCompilerTool" | 196 | Name="VCCLCompilerTool" |
197 | Optimization="0" | 197 | Optimization="0" |
198 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 198 | AdditionalIncludeDirectories="..\..\.." |
199 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" | 199 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" |
200 | ExceptionHandling="0" | 200 | ExceptionHandling="0" |
201 | RuntimeLibrary="3" | 201 | RuntimeLibrary="3" |
@@ -268,8 +268,8 @@ | |||
268 | <Tool | 268 | <Tool |
269 | Name="VCCLCompilerTool" | 269 | Name="VCCLCompilerTool" |
270 | InlineFunctionExpansion="1" | 270 | InlineFunctionExpansion="1" |
271 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 271 | AdditionalIncludeDirectories="..\..\.." |
272 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF" | 272 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
273 | StringPooling="true" | 273 | StringPooling="true" |
274 | ExceptionHandling="0" | 274 | ExceptionHandling="0" |
275 | RuntimeLibrary="0" | 275 | RuntimeLibrary="0" |
@@ -295,7 +295,6 @@ | |||
295 | <Tool | 295 | <Tool |
296 | Name="VCLibrarianTool" | 296 | Name="VCLibrarianTool" |
297 | AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB" | 297 | AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB" |
298 | AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj " | ||
299 | OutputFile="$(OutDir)\zlibstat.lib" | 298 | OutputFile="$(OutDir)\zlibstat.lib" |
300 | SuppressStartupBanner="true" | 299 | SuppressStartupBanner="true" |
301 | /> | 300 | /> |
@@ -343,8 +342,8 @@ | |||
343 | <Tool | 342 | <Tool |
344 | Name="VCCLCompilerTool" | 343 | Name="VCCLCompilerTool" |
345 | InlineFunctionExpansion="1" | 344 | InlineFunctionExpansion="1" |
346 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 345 | AdditionalIncludeDirectories="..\..\.." |
347 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64" | 346 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" |
348 | StringPooling="true" | 347 | StringPooling="true" |
349 | ExceptionHandling="0" | 348 | ExceptionHandling="0" |
350 | RuntimeLibrary="2" | 349 | RuntimeLibrary="2" |
@@ -370,7 +369,6 @@ | |||
370 | <Tool | 369 | <Tool |
371 | Name="VCLibrarianTool" | 370 | Name="VCLibrarianTool" |
372 | AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB" | 371 | AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB" |
373 | AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj " | ||
374 | OutputFile="$(OutDir)\zlibstat.lib" | 372 | OutputFile="$(OutDir)\zlibstat.lib" |
375 | SuppressStartupBanner="true" | 373 | SuppressStartupBanner="true" |
376 | /> | 374 | /> |
@@ -418,7 +416,7 @@ | |||
418 | <Tool | 416 | <Tool |
419 | Name="VCCLCompilerTool" | 417 | Name="VCCLCompilerTool" |
420 | InlineFunctionExpansion="1" | 418 | InlineFunctionExpansion="1" |
421 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 419 | AdditionalIncludeDirectories="..\..\.." |
422 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" | 420 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" |
423 | StringPooling="true" | 421 | StringPooling="true" |
424 | ExceptionHandling="0" | 422 | ExceptionHandling="0" |
@@ -491,7 +489,7 @@ | |||
491 | <Tool | 489 | <Tool |
492 | Name="VCCLCompilerTool" | 490 | Name="VCCLCompilerTool" |
493 | InlineFunctionExpansion="1" | 491 | InlineFunctionExpansion="1" |
494 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 492 | AdditionalIncludeDirectories="..\..\.." |
495 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" | 493 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
496 | StringPooling="true" | 494 | StringPooling="true" |
497 | ExceptionHandling="0" | 495 | ExceptionHandling="0" |
@@ -565,7 +563,7 @@ | |||
565 | <Tool | 563 | <Tool |
566 | Name="VCCLCompilerTool" | 564 | Name="VCCLCompilerTool" |
567 | InlineFunctionExpansion="1" | 565 | InlineFunctionExpansion="1" |
568 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 566 | AdditionalIncludeDirectories="..\..\.." |
569 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" | 567 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" |
570 | StringPooling="true" | 568 | StringPooling="true" |
571 | ExceptionHandling="0" | 569 | ExceptionHandling="0" |
@@ -639,7 +637,7 @@ | |||
639 | <Tool | 637 | <Tool |
640 | Name="VCCLCompilerTool" | 638 | Name="VCCLCompilerTool" |
641 | InlineFunctionExpansion="1" | 639 | InlineFunctionExpansion="1" |
642 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 640 | AdditionalIncludeDirectories="..\..\.." |
643 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" | 641 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" |
644 | StringPooling="true" | 642 | StringPooling="true" |
645 | ExceptionHandling="0" | 643 | ExceptionHandling="0" |
@@ -733,58 +731,6 @@ | |||
733 | > | 731 | > |
734 | </File> | 732 | </File> |
735 | <File | 733 | <File |
736 | RelativePath="..\..\masmx64\inffas8664.c" | ||
737 | > | ||
738 | <FileConfiguration | ||
739 | Name="Debug|Win32" | ||
740 | ExcludedFromBuild="true" | ||
741 | > | ||
742 | <Tool | ||
743 | Name="VCCLCompilerTool" | ||
744 | /> | ||
745 | </FileConfiguration> | ||
746 | <FileConfiguration | ||
747 | Name="Debug|Itanium" | ||
748 | ExcludedFromBuild="true" | ||
749 | > | ||
750 | <Tool | ||
751 | Name="VCCLCompilerTool" | ||
752 | /> | ||
753 | </FileConfiguration> | ||
754 | <FileConfiguration | ||
755 | Name="Release|Win32" | ||
756 | ExcludedFromBuild="true" | ||
757 | > | ||
758 | <Tool | ||
759 | Name="VCCLCompilerTool" | ||
760 | /> | ||
761 | </FileConfiguration> | ||
762 | <FileConfiguration | ||
763 | Name="Release|Itanium" | ||
764 | ExcludedFromBuild="true" | ||
765 | > | ||
766 | <Tool | ||
767 | Name="VCCLCompilerTool" | ||
768 | /> | ||
769 | </FileConfiguration> | ||
770 | <FileConfiguration | ||
771 | Name="ReleaseWithoutAsm|Win32" | ||
772 | ExcludedFromBuild="true" | ||
773 | > | ||
774 | <Tool | ||
775 | Name="VCCLCompilerTool" | ||
776 | /> | ||
777 | </FileConfiguration> | ||
778 | <FileConfiguration | ||
779 | Name="ReleaseWithoutAsm|Itanium" | ||
780 | ExcludedFromBuild="true" | ||
781 | > | ||
782 | <Tool | ||
783 | Name="VCCLCompilerTool" | ||
784 | /> | ||
785 | </FileConfiguration> | ||
786 | </File> | ||
787 | <File | ||
788 | RelativePath="..\..\..\inffast.c" | 734 | RelativePath="..\..\..\inffast.c" |
789 | > | 735 | > |
790 | </File> | 736 | </File> |
diff --git a/contrib/vstudio/vc9/zlibvc.vcproj b/contrib/vstudio/vc9/zlibvc.vcproj index c9a8947..f11dd1f 100644 --- a/contrib/vstudio/vc9/zlibvc.vcproj +++ b/contrib/vstudio/vc9/zlibvc.vcproj | |||
@@ -53,8 +53,8 @@ | |||
53 | <Tool | 53 | <Tool |
54 | Name="VCCLCompilerTool" | 54 | Name="VCCLCompilerTool" |
55 | Optimization="0" | 55 | Optimization="0" |
56 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 56 | AdditionalIncludeDirectories="..\..\.." |
57 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF" | 57 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI" |
58 | ExceptionHandling="0" | 58 | ExceptionHandling="0" |
59 | RuntimeLibrary="1" | 59 | RuntimeLibrary="1" |
60 | BufferSecurityCheck="false" | 60 | BufferSecurityCheck="false" |
@@ -81,7 +81,6 @@ | |||
81 | <Tool | 81 | <Tool |
82 | Name="VCLinkerTool" | 82 | Name="VCLinkerTool" |
83 | AdditionalOptions="/MACHINE:I386" | 83 | AdditionalOptions="/MACHINE:I386" |
84 | AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj" | ||
85 | OutputFile="$(OutDir)\zlibwapi.dll" | 84 | OutputFile="$(OutDir)\zlibwapi.dll" |
86 | LinkIncremental="2" | 85 | LinkIncremental="2" |
87 | SuppressStartupBanner="true" | 86 | SuppressStartupBanner="true" |
@@ -150,8 +149,8 @@ | |||
150 | <Tool | 149 | <Tool |
151 | Name="VCCLCompilerTool" | 150 | Name="VCCLCompilerTool" |
152 | Optimization="0" | 151 | Optimization="0" |
153 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 152 | AdditionalIncludeDirectories="..\..\.." |
154 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64" | 153 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64" |
155 | ExceptionHandling="0" | 154 | ExceptionHandling="0" |
156 | RuntimeLibrary="3" | 155 | RuntimeLibrary="3" |
157 | BufferSecurityCheck="false" | 156 | BufferSecurityCheck="false" |
@@ -177,7 +176,6 @@ | |||
177 | /> | 176 | /> |
178 | <Tool | 177 | <Tool |
179 | Name="VCLinkerTool" | 178 | Name="VCLinkerTool" |
180 | AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj " | ||
181 | OutputFile="$(OutDir)\zlibwapi.dll" | 179 | OutputFile="$(OutDir)\zlibwapi.dll" |
182 | LinkIncremental="2" | 180 | LinkIncremental="2" |
183 | SuppressStartupBanner="true" | 181 | SuppressStartupBanner="true" |
@@ -245,7 +243,7 @@ | |||
245 | <Tool | 243 | <Tool |
246 | Name="VCCLCompilerTool" | 244 | Name="VCCLCompilerTool" |
247 | Optimization="0" | 245 | Optimization="0" |
248 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 246 | AdditionalIncludeDirectories="..\..\.." |
249 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64" | 247 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64" |
250 | ExceptionHandling="0" | 248 | ExceptionHandling="0" |
251 | RuntimeLibrary="3" | 249 | RuntimeLibrary="3" |
@@ -340,7 +338,7 @@ | |||
340 | <Tool | 338 | <Tool |
341 | Name="VCCLCompilerTool" | 339 | Name="VCCLCompilerTool" |
342 | InlineFunctionExpansion="1" | 340 | InlineFunctionExpansion="1" |
343 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 341 | AdditionalIncludeDirectories="..\..\.." |
344 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI" | 342 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI" |
345 | StringPooling="true" | 343 | StringPooling="true" |
346 | ExceptionHandling="0" | 344 | ExceptionHandling="0" |
@@ -440,7 +438,7 @@ | |||
440 | <Tool | 438 | <Tool |
441 | Name="VCCLCompilerTool" | 439 | Name="VCCLCompilerTool" |
442 | InlineFunctionExpansion="1" | 440 | InlineFunctionExpansion="1" |
443 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 441 | AdditionalIncludeDirectories="..\..\.." |
444 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64" | 442 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64" |
445 | StringPooling="true" | 443 | StringPooling="true" |
446 | ExceptionHandling="0" | 444 | ExceptionHandling="0" |
@@ -538,7 +536,7 @@ | |||
538 | <Tool | 536 | <Tool |
539 | Name="VCCLCompilerTool" | 537 | Name="VCCLCompilerTool" |
540 | InlineFunctionExpansion="1" | 538 | InlineFunctionExpansion="1" |
541 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 539 | AdditionalIncludeDirectories="..\..\.." |
542 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64" | 540 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64" |
543 | StringPooling="true" | 541 | StringPooling="true" |
544 | ExceptionHandling="0" | 542 | ExceptionHandling="0" |
@@ -636,8 +634,8 @@ | |||
636 | <Tool | 634 | <Tool |
637 | Name="VCCLCompilerTool" | 635 | Name="VCCLCompilerTool" |
638 | InlineFunctionExpansion="1" | 636 | InlineFunctionExpansion="1" |
639 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 637 | AdditionalIncludeDirectories="..\..\.." |
640 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF" | 638 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI" |
641 | StringPooling="true" | 639 | StringPooling="true" |
642 | ExceptionHandling="0" | 640 | ExceptionHandling="0" |
643 | RuntimeLibrary="0" | 641 | RuntimeLibrary="0" |
@@ -666,7 +664,6 @@ | |||
666 | <Tool | 664 | <Tool |
667 | Name="VCLinkerTool" | 665 | Name="VCLinkerTool" |
668 | AdditionalOptions="/MACHINE:I386" | 666 | AdditionalOptions="/MACHINE:I386" |
669 | AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj " | ||
670 | OutputFile="$(OutDir)\zlibwapi.dll" | 667 | OutputFile="$(OutDir)\zlibwapi.dll" |
671 | LinkIncremental="1" | 668 | LinkIncremental="1" |
672 | SuppressStartupBanner="true" | 669 | SuppressStartupBanner="true" |
@@ -737,8 +734,8 @@ | |||
737 | <Tool | 734 | <Tool |
738 | Name="VCCLCompilerTool" | 735 | Name="VCCLCompilerTool" |
739 | InlineFunctionExpansion="1" | 736 | InlineFunctionExpansion="1" |
740 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 737 | AdditionalIncludeDirectories="..\..\.." |
741 | PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64" | 738 | PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64" |
742 | StringPooling="true" | 739 | StringPooling="true" |
743 | ExceptionHandling="0" | 740 | ExceptionHandling="0" |
744 | RuntimeLibrary="2" | 741 | RuntimeLibrary="2" |
@@ -766,7 +763,6 @@ | |||
766 | /> | 763 | /> |
767 | <Tool | 764 | <Tool |
768 | Name="VCLinkerTool" | 765 | Name="VCLinkerTool" |
769 | AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj " | ||
770 | OutputFile="$(OutDir)\zlibwapi.dll" | 766 | OutputFile="$(OutDir)\zlibwapi.dll" |
771 | LinkIncremental="1" | 767 | LinkIncremental="1" |
772 | SuppressStartupBanner="true" | 768 | SuppressStartupBanner="true" |
@@ -836,7 +832,7 @@ | |||
836 | <Tool | 832 | <Tool |
837 | Name="VCCLCompilerTool" | 833 | Name="VCCLCompilerTool" |
838 | InlineFunctionExpansion="1" | 834 | InlineFunctionExpansion="1" |
839 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 835 | AdditionalIncludeDirectories="..\..\.." |
840 | PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64" | 836 | PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64" |
841 | StringPooling="true" | 837 | StringPooling="true" |
842 | ExceptionHandling="0" | 838 | ExceptionHandling="0" |
@@ -950,58 +946,6 @@ | |||
950 | > | 946 | > |
951 | </File> | 947 | </File> |
952 | <File | 948 | <File |
953 | RelativePath="..\..\masmx64\inffas8664.c" | ||
954 | > | ||
955 | <FileConfiguration | ||
956 | Name="Debug|Win32" | ||
957 | ExcludedFromBuild="true" | ||
958 | > | ||
959 | <Tool | ||
960 | Name="VCCLCompilerTool" | ||
961 | /> | ||
962 | </FileConfiguration> | ||
963 | <FileConfiguration | ||
964 | Name="Debug|Itanium" | ||
965 | ExcludedFromBuild="true" | ||
966 | > | ||
967 | <Tool | ||
968 | Name="VCCLCompilerTool" | ||
969 | /> | ||
970 | </FileConfiguration> | ||
971 | <FileConfiguration | ||
972 | Name="ReleaseWithoutAsm|Win32" | ||
973 | ExcludedFromBuild="true" | ||
974 | > | ||
975 | <Tool | ||
976 | Name="VCCLCompilerTool" | ||
977 | /> | ||
978 | </FileConfiguration> | ||
979 | <FileConfiguration | ||
980 | Name="ReleaseWithoutAsm|Itanium" | ||
981 | ExcludedFromBuild="true" | ||
982 | > | ||
983 | <Tool | ||
984 | Name="VCCLCompilerTool" | ||
985 | /> | ||
986 | </FileConfiguration> | ||
987 | <FileConfiguration | ||
988 | Name="Release|Win32" | ||
989 | ExcludedFromBuild="true" | ||
990 | > | ||
991 | <Tool | ||
992 | Name="VCCLCompilerTool" | ||
993 | /> | ||
994 | </FileConfiguration> | ||
995 | <FileConfiguration | ||
996 | Name="Release|Itanium" | ||
997 | ExcludedFromBuild="true" | ||
998 | > | ||
999 | <Tool | ||
1000 | Name="VCCLCompilerTool" | ||
1001 | /> | ||
1002 | </FileConfiguration> | ||
1003 | </File> | ||
1004 | <File | ||
1005 | RelativePath="..\..\..\inffast.c" | 949 | RelativePath="..\..\..\inffast.c" |
1006 | > | 950 | > |
1007 | </File> | 951 | </File> |