aboutsummaryrefslogtreecommitdiff
path: root/contrib/vstudio/vc10
diff options
context:
space:
mode:
authorMark Adler <fork@madler.net>2022-10-06 12:52:49 -0700
committerMark Adler <fork@madler.net>2022-10-06 20:43:09 -0700
commitd0704a820186481da35d08f4b655881e1d32089f (patch)
tree6b4365d354376de1e2fd10f1687e2daf48efb73a /contrib/vstudio/vc10
parent095da07753035a2b80654553e1cad92d1dee1481 (diff)
downloadzlib-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/vc10')
-rw-r--r--contrib/vstudio/vc10/miniunz.vcxproj.filters2
-rw-r--r--contrib/vstudio/vc10/minizip.vcxproj.filters2
-rw-r--r--contrib/vstudio/vc10/testzlib.vcxproj24
-rw-r--r--contrib/vstudio/vc10/testzlib.vcxproj.filters5
-rw-r--r--contrib/vstudio/vc10/testzlibdll.vcxproj.filters2
-rw-r--r--contrib/vstudio/vc10/zlibstat.vcxproj50
-rw-r--r--contrib/vstudio/vc10/zlibstat.vcxproj.filters3
-rw-r--r--contrib/vstudio/vc10/zlibvc.vcxproj58
-rw-r--r--contrib/vstudio/vc10/zlibvc.vcxproj.filters3
9 files changed, 42 insertions, 107 deletions
diff --git a/contrib/vstudio/vc10/miniunz.vcxproj.filters b/contrib/vstudio/vc10/miniunz.vcxproj.filters
index 0b2a3de..e53556a 100644
--- a/contrib/vstudio/vc10/miniunz.vcxproj.filters
+++ b/contrib/vstudio/vc10/miniunz.vcxproj.filters
@@ -3,7 +3,7 @@
3 <ItemGroup> 3 <ItemGroup>
4 <Filter Include="Source Files"> 4 <Filter Include="Source Files">
5 <UniqueIdentifier>{048af943-022b-4db6-beeb-a54c34774ee2}</UniqueIdentifier> 5 <UniqueIdentifier>{048af943-022b-4db6-beeb-a54c34774ee2}</UniqueIdentifier>
6 <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions> 6 <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat</Extensions>
7 </Filter> 7 </Filter>
8 <Filter Include="Header Files"> 8 <Filter Include="Header Files">
9 <UniqueIdentifier>{c1d600d2-888f-4aea-b73e-8b0dd9befa0c}</UniqueIdentifier> 9 <UniqueIdentifier>{c1d600d2-888f-4aea-b73e-8b0dd9befa0c}</UniqueIdentifier>
diff --git a/contrib/vstudio/vc10/minizip.vcxproj.filters b/contrib/vstudio/vc10/minizip.vcxproj.filters
index dd73cd3..bd18d71 100644
--- a/contrib/vstudio/vc10/minizip.vcxproj.filters
+++ b/contrib/vstudio/vc10/minizip.vcxproj.filters
@@ -3,7 +3,7 @@
3 <ItemGroup> 3 <ItemGroup>
4 <Filter Include="Source Files"> 4 <Filter Include="Source Files">
5 <UniqueIdentifier>{c0419b40-bf50-40da-b153-ff74215b79de}</UniqueIdentifier> 5 <UniqueIdentifier>{c0419b40-bf50-40da-b153-ff74215b79de}</UniqueIdentifier>
6 <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions> 6 <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat</Extensions>
7 </Filter> 7 </Filter>
8 <Filter Include="Header Files"> 8 <Filter Include="Header Files">
9 <UniqueIdentifier>{bb87b070-735b-478e-92ce-7383abb2f36c}</UniqueIdentifier> 9 <UniqueIdentifier>{bb87b070-735b-478e-92ce-7383abb2f36c}</UniqueIdentifier>
diff --git a/contrib/vstudio/vc10/testzlib.vcxproj b/contrib/vstudio/vc10/testzlib.vcxproj
index 9088d17..0e668f7 100644
--- a/contrib/vstudio/vc10/testzlib.vcxproj
+++ b/contrib/vstudio/vc10/testzlib.vcxproj
@@ -181,7 +181,7 @@
181 <ClCompile> 181 <ClCompile>
182 <Optimization>Disabled</Optimization> 182 <Optimization>Disabled</Optimization>
183 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 183 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
184 <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 184 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
185 <MinimalRebuild>true</MinimalRebuild> 185 <MinimalRebuild>true</MinimalRebuild>
186 <BasicRuntimeChecks>Default</BasicRuntimeChecks> 186 <BasicRuntimeChecks>Default</BasicRuntimeChecks>
187 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> 187 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -194,7 +194,7 @@
194 <DebugInformationFormat>EditAndContinue</DebugInformationFormat> 194 <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
195 </ClCompile> 195 </ClCompile>
196 <Link> 196 <Link>
197 <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> 197 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
198 <OutputFile>$(OutDir)testzlib.exe</OutputFile> 198 <OutputFile>$(OutDir)testzlib.exe</OutputFile>
199 <GenerateDebugInformation>true</GenerateDebugInformation> 199 <GenerateDebugInformation>true</GenerateDebugInformation>
200 <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile> 200 <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
@@ -241,7 +241,7 @@
241 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 241 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
242 <OmitFramePointers>true</OmitFramePointers> 242 <OmitFramePointers>true</OmitFramePointers>
243 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 243 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
244 <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 244 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
245 <StringPooling>true</StringPooling> 245 <StringPooling>true</StringPooling>
246 <BasicRuntimeChecks>Default</BasicRuntimeChecks> 246 <BasicRuntimeChecks>Default</BasicRuntimeChecks>
247 <RuntimeLibrary>MultiThreaded</RuntimeLibrary> 247 <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -254,7 +254,7 @@
254 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> 254 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
255 </ClCompile> 255 </ClCompile>
256 <Link> 256 <Link>
257 <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> 257 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
258 <OutputFile>$(OutDir)testzlib.exe</OutputFile> 258 <OutputFile>$(OutDir)testzlib.exe</OutputFile>
259 <GenerateDebugInformation>true</GenerateDebugInformation> 259 <GenerateDebugInformation>true</GenerateDebugInformation>
260 <SubSystem>Console</SubSystem> 260 <SubSystem>Console</SubSystem>
@@ -269,14 +269,14 @@
269 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 269 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
270 <ClCompile> 270 <ClCompile>
271 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 271 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
272 <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 272 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
273 <BasicRuntimeChecks>Default</BasicRuntimeChecks> 273 <BasicRuntimeChecks>Default</BasicRuntimeChecks>
274 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> 274 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
275 <BufferSecurityCheck>false</BufferSecurityCheck> 275 <BufferSecurityCheck>false</BufferSecurityCheck>
276 <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> 276 <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
277 </ClCompile> 277 </ClCompile>
278 <Link> 278 <Link>
279 <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> 279 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
280 </Link> 280 </Link>
281 </ItemDefinitionGroup> 281 </ItemDefinitionGroup>
282 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> 282 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
@@ -352,14 +352,14 @@
352 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 352 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
353 <ClCompile> 353 <ClCompile>
354 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 354 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
355 <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 355 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
356 <BasicRuntimeChecks>Default</BasicRuntimeChecks> 356 <BasicRuntimeChecks>Default</BasicRuntimeChecks>
357 <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> 357 <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
358 <BufferSecurityCheck>false</BufferSecurityCheck> 358 <BufferSecurityCheck>false</BufferSecurityCheck>
359 <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> 359 <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
360 </ClCompile> 360 </ClCompile>
361 <Link> 361 <Link>
362 <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> 362 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
363 </Link> 363 </Link>
364 </ItemDefinitionGroup> 364 </ItemDefinitionGroup>
365 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> 365 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
@@ -398,14 +398,6 @@
398 <ClCompile Include="..\..\..\crc32.c" /> 398 <ClCompile Include="..\..\..\crc32.c" />
399 <ClCompile Include="..\..\..\deflate.c" /> 399 <ClCompile Include="..\..\..\deflate.c" />
400 <ClCompile Include="..\..\..\infback.c" /> 400 <ClCompile Include="..\..\..\infback.c" />
401 <ClCompile Include="..\..\masmx64\inffas8664.c">
402 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
403 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
404 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
405 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
406 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
407 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
408 </ClCompile>
409 <ClCompile Include="..\..\..\inffast.c" /> 401 <ClCompile Include="..\..\..\inffast.c" />
410 <ClCompile Include="..\..\..\inflate.c" /> 402 <ClCompile Include="..\..\..\inflate.c" />
411 <ClCompile Include="..\..\..\inftrees.c" /> 403 <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/contrib/vstudio/vc10/testzlib.vcxproj.filters b/contrib/vstudio/vc10/testzlib.vcxproj.filters
index 249daa8..3cf52ee 100644
--- a/contrib/vstudio/vc10/testzlib.vcxproj.filters
+++ b/contrib/vstudio/vc10/testzlib.vcxproj.filters
@@ -3,7 +3,7 @@
3 <ItemGroup> 3 <ItemGroup>
4 <Filter Include="Source Files"> 4 <Filter Include="Source Files">
5 <UniqueIdentifier>{c1f6a2e3-5da5-4955-8653-310d3efe05a9}</UniqueIdentifier> 5 <UniqueIdentifier>{c1f6a2e3-5da5-4955-8653-310d3efe05a9}</UniqueIdentifier>
6 <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions> 6 <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat</Extensions>
7 </Filter> 7 </Filter>
8 <Filter Include="Header Files"> 8 <Filter Include="Header Files">
9 <UniqueIdentifier>{c2aaffdc-2c95-4d6f-8466-4bec5890af2c}</UniqueIdentifier> 9 <UniqueIdentifier>{c2aaffdc-2c95-4d6f-8466-4bec5890af2c}</UniqueIdentifier>
@@ -30,9 +30,6 @@
30 <ClCompile Include="..\..\..\infback.c"> 30 <ClCompile Include="..\..\..\infback.c">
31 <Filter>Source Files</Filter> 31 <Filter>Source Files</Filter>
32 </ClCompile> 32 </ClCompile>
33 <ClCompile Include="..\..\masmx64\inffas8664.c">
34 <Filter>Source Files</Filter>
35 </ClCompile>
36 <ClCompile Include="..\..\..\inffast.c"> 33 <ClCompile Include="..\..\..\inffast.c">
37 <Filter>Source Files</Filter> 34 <Filter>Source Files</Filter>
38 </ClCompile> 35 </ClCompile>
diff --git a/contrib/vstudio/vc10/testzlibdll.vcxproj.filters b/contrib/vstudio/vc10/testzlibdll.vcxproj.filters
index 53a8693..aeb550e 100644
--- a/contrib/vstudio/vc10/testzlibdll.vcxproj.filters
+++ b/contrib/vstudio/vc10/testzlibdll.vcxproj.filters
@@ -3,7 +3,7 @@
3 <ItemGroup> 3 <ItemGroup>
4 <Filter Include="Source Files"> 4 <Filter Include="Source Files">
5 <UniqueIdentifier>{fa61a89f-93fc-4c89-b29e-36224b7592f4}</UniqueIdentifier> 5 <UniqueIdentifier>{fa61a89f-93fc-4c89-b29e-36224b7592f4}</UniqueIdentifier>
6 <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions> 6 <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat</Extensions>
7 </Filter> 7 </Filter>
8 <Filter Include="Header Files"> 8 <Filter Include="Header Files">
9 <UniqueIdentifier>{d4b85da0-2ba2-4934-b57f-e2584e3848ee}</UniqueIdentifier> 9 <UniqueIdentifier>{d4b85da0-2ba2-4934-b57f-e2584e3848ee}</UniqueIdentifier>
diff --git a/contrib/vstudio/vc10/zlibstat.vcxproj b/contrib/vstudio/vc10/zlibstat.vcxproj
index b9f2bbe..c7ed09e 100644
--- a/contrib/vstudio/vc10/zlibstat.vcxproj
+++ b/contrib/vstudio/vc10/zlibstat.vcxproj
@@ -160,7 +160,7 @@
160 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 160 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
161 <ClCompile> 161 <ClCompile>
162 <Optimization>Disabled</Optimization> 162 <Optimization>Disabled</Optimization>
163 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 163 <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
164 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 164 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
165 <ExceptionHandling> 165 <ExceptionHandling>
166 </ExceptionHandling> 166 </ExceptionHandling>
@@ -182,16 +182,12 @@
182 <OutputFile>$(OutDir)zlibstat.lib</OutputFile> 182 <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
183 <SuppressStartupBanner>true</SuppressStartupBanner> 183 <SuppressStartupBanner>true</SuppressStartupBanner>
184 </Lib> 184 </Lib>
185 <PreBuildEvent>
186 <Command>cd ..\..\masmx86
187bld_ml32.bat</Command>
188 </PreBuildEvent>
189 </ItemDefinitionGroup> 185 </ItemDefinitionGroup>
190 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 186 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
191 <ClCompile> 187 <ClCompile>
192 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 188 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
193 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 189 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
194 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions> 190 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
195 <StringPooling>true</StringPooling> 191 <StringPooling>true</StringPooling>
196 <ExceptionHandling> 192 <ExceptionHandling>
197 </ExceptionHandling> 193 </ExceptionHandling>
@@ -210,19 +206,15 @@ bld_ml32.bat</Command>
210 </ResourceCompile> 206 </ResourceCompile>
211 <Lib> 207 <Lib>
212 <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> 208 <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
213 <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> 209 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
214 <OutputFile>$(OutDir)zlibstat.lib</OutputFile> 210 <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
215 <SuppressStartupBanner>true</SuppressStartupBanner> 211 <SuppressStartupBanner>true</SuppressStartupBanner>
216 </Lib> 212 </Lib>
217 <PreBuildEvent>
218 <Command>cd ..\..\masmx86
219bld_ml32.bat</Command>
220 </PreBuildEvent>
221 </ItemDefinitionGroup> 213 </ItemDefinitionGroup>
222 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> 214 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
223 <ClCompile> 215 <ClCompile>
224 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 216 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
225 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 217 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
226 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 218 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
227 <StringPooling>true</StringPooling> 219 <StringPooling>true</StringPooling>
228 <ExceptionHandling> 220 <ExceptionHandling>
@@ -252,7 +244,7 @@ bld_ml32.bat</Command>
252 </Midl> 244 </Midl>
253 <ClCompile> 245 <ClCompile>
254 <Optimization>Disabled</Optimization> 246 <Optimization>Disabled</Optimization>
255 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 247 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
256 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 248 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
257 <ExceptionHandling> 249 <ExceptionHandling>
258 </ExceptionHandling> 250 </ExceptionHandling>
@@ -274,10 +266,6 @@ bld_ml32.bat</Command>
274 <OutputFile>$(OutDir)zlibstat.lib</OutputFile> 266 <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
275 <SuppressStartupBanner>true</SuppressStartupBanner> 267 <SuppressStartupBanner>true</SuppressStartupBanner>
276 </Lib> 268 </Lib>
277 <PreBuildEvent>
278 <Command>cd ..\..\masmx64
279bld_ml64.bat</Command>
280 </PreBuildEvent>
281 </ItemDefinitionGroup> 269 </ItemDefinitionGroup>
282 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> 270 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
283 <Midl> 271 <Midl>
@@ -285,7 +273,7 @@ bld_ml64.bat</Command>
285 </Midl> 273 </Midl>
286 <ClCompile> 274 <ClCompile>
287 <Optimization>Disabled</Optimization> 275 <Optimization>Disabled</Optimization>
288 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 276 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
289 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 277 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
290 <ExceptionHandling> 278 <ExceptionHandling>
291 </ExceptionHandling> 279 </ExceptionHandling>
@@ -314,8 +302,8 @@ bld_ml64.bat</Command>
314 </Midl> 302 </Midl>
315 <ClCompile> 303 <ClCompile>
316 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 304 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
317 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 305 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
318 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 306 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
319 <StringPooling>true</StringPooling> 307 <StringPooling>true</StringPooling>
320 <ExceptionHandling> 308 <ExceptionHandling>
321 </ExceptionHandling> 309 </ExceptionHandling>
@@ -334,14 +322,10 @@ bld_ml64.bat</Command>
334 </ResourceCompile> 322 </ResourceCompile>
335 <Lib> 323 <Lib>
336 <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> 324 <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
337 <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> 325 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
338 <OutputFile>$(OutDir)zlibstat.lib</OutputFile> 326 <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
339 <SuppressStartupBanner>true</SuppressStartupBanner> 327 <SuppressStartupBanner>true</SuppressStartupBanner>
340 </Lib> 328 </Lib>
341 <PreBuildEvent>
342 <Command>cd ..\..\masmx64
343bld_ml64.bat</Command>
344 </PreBuildEvent>
345 </ItemDefinitionGroup> 329 </ItemDefinitionGroup>
346 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> 330 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
347 <Midl> 331 <Midl>
@@ -349,7 +333,7 @@ bld_ml64.bat</Command>
349 </Midl> 333 </Midl>
350 <ClCompile> 334 <ClCompile>
351 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 335 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
352 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 336 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
353 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 337 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
354 <StringPooling>true</StringPooling> 338 <StringPooling>true</StringPooling>
355 <ExceptionHandling> 339 <ExceptionHandling>
@@ -379,7 +363,7 @@ bld_ml64.bat</Command>
379 </Midl> 363 </Midl>
380 <ClCompile> 364 <ClCompile>
381 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 365 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
382 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 366 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
383 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 367 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
384 <StringPooling>true</StringPooling> 368 <StringPooling>true</StringPooling>
385 <ExceptionHandling> 369 <ExceptionHandling>
@@ -409,7 +393,7 @@ bld_ml64.bat</Command>
409 </Midl> 393 </Midl>
410 <ClCompile> 394 <ClCompile>
411 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 395 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
412 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 396 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
413 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 397 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
414 <StringPooling>true</StringPooling> 398 <StringPooling>true</StringPooling>
415 <ExceptionHandling> 399 <ExceptionHandling>
@@ -443,14 +427,6 @@ bld_ml64.bat</Command>
443 <ClCompile Include="..\..\..\gzread.c" /> 427 <ClCompile Include="..\..\..\gzread.c" />
444 <ClCompile Include="..\..\..\gzwrite.c" /> 428 <ClCompile Include="..\..\..\gzwrite.c" />
445 <ClCompile Include="..\..\..\infback.c" /> 429 <ClCompile Include="..\..\..\infback.c" />
446 <ClCompile Include="..\..\masmx64\inffas8664.c">
447 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
448 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
449 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
450 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
451 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
452 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
453 </ClCompile>
454 <ClCompile Include="..\..\..\inffast.c" /> 430 <ClCompile Include="..\..\..\inffast.c" />
455 <ClCompile Include="..\..\..\inflate.c" /> 431 <ClCompile Include="..\..\..\inflate.c" />
456 <ClCompile Include="..\..\..\inftrees.c" /> 432 <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/contrib/vstudio/vc10/zlibstat.vcxproj.filters b/contrib/vstudio/vc10/zlibstat.vcxproj.filters
index c8c7f7e..ba7e23d 100644
--- a/contrib/vstudio/vc10/zlibstat.vcxproj.filters
+++ b/contrib/vstudio/vc10/zlibstat.vcxproj.filters
@@ -33,9 +33,6 @@
33 <ClCompile Include="..\..\..\infback.c"> 33 <ClCompile Include="..\..\..\infback.c">
34 <Filter>Source Files</Filter> 34 <Filter>Source Files</Filter>
35 </ClCompile> 35 </ClCompile>
36 <ClCompile Include="..\..\masmx64\inffas8664.c">
37 <Filter>Source Files</Filter>
38 </ClCompile>
39 <ClCompile Include="..\..\..\inffast.c"> 36 <ClCompile Include="..\..\..\inffast.c">
40 <Filter>Source Files</Filter> 37 <Filter>Source Files</Filter>
41 </ClCompile> 38 </ClCompile>
diff --git a/contrib/vstudio/vc10/zlibvc.vcxproj b/contrib/vstudio/vc10/zlibvc.vcxproj
index 6ff9ddb..19dfc35 100644
--- a/contrib/vstudio/vc10/zlibvc.vcxproj
+++ b/contrib/vstudio/vc10/zlibvc.vcxproj
@@ -197,8 +197,8 @@
197 </Midl> 197 </Midl>
198 <ClCompile> 198 <ClCompile>
199 <Optimization>Disabled</Optimization> 199 <Optimization>Disabled</Optimization>
200 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 200 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
201 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions> 201 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
202 <ExceptionHandling> 202 <ExceptionHandling>
203 </ExceptionHandling> 203 </ExceptionHandling>
204 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> 204 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -219,7 +219,7 @@
219 </ResourceCompile> 219 </ResourceCompile>
220 <Link> 220 <Link>
221 <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> 221 <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
222 <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> 222 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
223 <SuppressStartupBanner>true</SuppressStartupBanner> 223 <SuppressStartupBanner>true</SuppressStartupBanner>
224 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> 224 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
225 <GenerateDebugInformation>true</GenerateDebugInformation> 225 <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -229,10 +229,6 @@
229 <DataExecutionPrevention> 229 <DataExecutionPrevention>
230 </DataExecutionPrevention> 230 </DataExecutionPrevention>
231 </Link> 231 </Link>
232 <PreBuildEvent>
233 <Command>cd ..\..\masmx86
234bld_ml32.bat</Command>
235 </PreBuildEvent>
236 </ItemDefinitionGroup> 232 </ItemDefinitionGroup>
237 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> 233 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
238 <Midl> 234 <Midl>
@@ -244,7 +240,7 @@ bld_ml32.bat</Command>
244 </Midl> 240 </Midl>
245 <ClCompile> 241 <ClCompile>
246 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 242 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
247 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 243 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
248 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions> 244 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
249 <StringPooling>true</StringPooling> 245 <StringPooling>true</StringPooling>
250 <ExceptionHandling> 246 <ExceptionHandling>
@@ -288,8 +284,8 @@ bld_ml32.bat</Command>
288 </Midl> 284 </Midl>
289 <ClCompile> 285 <ClCompile>
290 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 286 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
291 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 287 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
292 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions> 288 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
293 <StringPooling>true</StringPooling> 289 <StringPooling>true</StringPooling>
294 <ExceptionHandling> 290 <ExceptionHandling>
295 </ExceptionHandling> 291 </ExceptionHandling>
@@ -312,7 +308,7 @@ bld_ml32.bat</Command>
312 </ResourceCompile> 308 </ResourceCompile>
313 <Link> 309 <Link>
314 <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> 310 <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
315 <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> 311 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
316 <SuppressStartupBanner>true</SuppressStartupBanner> 312 <SuppressStartupBanner>true</SuppressStartupBanner>
317 <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> 313 <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
318 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> 314 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
@@ -322,10 +318,6 @@ bld_ml32.bat</Command>
322 <DataExecutionPrevention> 318 <DataExecutionPrevention>
323 </DataExecutionPrevention> 319 </DataExecutionPrevention>
324 </Link> 320 </Link>
325 <PreBuildEvent>
326 <Command>cd ..\..\masmx86
327bld_ml32.bat</Command>
328 </PreBuildEvent>
329 </ItemDefinitionGroup> 321 </ItemDefinitionGroup>
330 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 322 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
331 <Midl> 323 <Midl>
@@ -337,8 +329,8 @@ bld_ml32.bat</Command>
337 </Midl> 329 </Midl>
338 <ClCompile> 330 <ClCompile>
339 <Optimization>Disabled</Optimization> 331 <Optimization>Disabled</Optimization>
340 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 332 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
341 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 333 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
342 <ExceptionHandling> 334 <ExceptionHandling>
343 </ExceptionHandling> 335 </ExceptionHandling>
344 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> 336 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -358,7 +350,7 @@ bld_ml32.bat</Command>
358 <Culture>0x040c</Culture> 350 <Culture>0x040c</Culture>
359 </ResourceCompile> 351 </ResourceCompile>
360 <Link> 352 <Link>
361 <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> 353 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
362 <SuppressStartupBanner>true</SuppressStartupBanner> 354 <SuppressStartupBanner>true</SuppressStartupBanner>
363 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> 355 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
364 <GenerateDebugInformation>true</GenerateDebugInformation> 356 <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -366,10 +358,6 @@ bld_ml32.bat</Command>
366 <SubSystem>Windows</SubSystem> 358 <SubSystem>Windows</SubSystem>
367 <TargetMachine>MachineX64</TargetMachine> 359 <TargetMachine>MachineX64</TargetMachine>
368 </Link> 360 </Link>
369 <PreBuildEvent>
370 <Command>cd ..\..\masmx64
371bld_ml64.bat</Command>
372 </PreBuildEvent>
373 </ItemDefinitionGroup> 361 </ItemDefinitionGroup>
374 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> 362 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
375 <Midl> 363 <Midl>
@@ -381,7 +369,7 @@ bld_ml64.bat</Command>
381 </Midl> 369 </Midl>
382 <ClCompile> 370 <ClCompile>
383 <Optimization>Disabled</Optimization> 371 <Optimization>Disabled</Optimization>
384 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 372 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
385 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 373 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
386 <ExceptionHandling> 374 <ExceptionHandling>
387 </ExceptionHandling> 375 </ExceptionHandling>
@@ -424,7 +412,7 @@ bld_ml64.bat</Command>
424 </Midl> 412 </Midl>
425 <ClCompile> 413 <ClCompile>
426 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 414 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
427 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 415 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
428 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 416 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
429 <StringPooling>true</StringPooling> 417 <StringPooling>true</StringPooling>
430 <ExceptionHandling> 418 <ExceptionHandling>
@@ -465,7 +453,7 @@ bld_ml64.bat</Command>
465 </Midl> 453 </Midl>
466 <ClCompile> 454 <ClCompile>
467 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 455 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
468 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 456 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
469 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 457 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
470 <StringPooling>true</StringPooling> 458 <StringPooling>true</StringPooling>
471 <ExceptionHandling> 459 <ExceptionHandling>
@@ -510,8 +498,8 @@ bld_ml64.bat</Command>
510 </Midl> 498 </Midl>
511 <ClCompile> 499 <ClCompile>
512 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 500 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
513 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 501 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
514 <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 502 <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
515 <StringPooling>true</StringPooling> 503 <StringPooling>true</StringPooling>
516 <ExceptionHandling> 504 <ExceptionHandling>
517 </ExceptionHandling> 505 </ExceptionHandling>
@@ -533,7 +521,7 @@ bld_ml64.bat</Command>
533 <Culture>0x040c</Culture> 521 <Culture>0x040c</Culture>
534 </ResourceCompile> 522 </ResourceCompile>
535 <Link> 523 <Link>
536 <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> 524 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
537 <SuppressStartupBanner>true</SuppressStartupBanner> 525 <SuppressStartupBanner>true</SuppressStartupBanner>
538 <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> 526 <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
539 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> 527 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
@@ -541,10 +529,6 @@ bld_ml64.bat</Command>
541 <SubSystem>Windows</SubSystem> 529 <SubSystem>Windows</SubSystem>
542 <TargetMachine>MachineX64</TargetMachine> 530 <TargetMachine>MachineX64</TargetMachine>
543 </Link> 531 </Link>
544 <PreBuildEvent>
545 <Command>cd ..\..\masmx64
546bld_ml64.bat</Command>
547 </PreBuildEvent>
548 </ItemDefinitionGroup> 532 </ItemDefinitionGroup>
549 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> 533 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
550 <Midl> 534 <Midl>
@@ -556,7 +540,7 @@ bld_ml64.bat</Command>
556 </Midl> 540 </Midl>
557 <ClCompile> 541 <ClCompile>
558 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 542 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
559 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 543 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
560 <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 544 <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
561 <StringPooling>true</StringPooling> 545 <StringPooling>true</StringPooling>
562 <ExceptionHandling> 546 <ExceptionHandling>
@@ -601,14 +585,6 @@ bld_ml64.bat</Command>
601 <ClCompile Include="..\..\..\gzread.c" /> 585 <ClCompile Include="..\..\..\gzread.c" />
602 <ClCompile Include="..\..\..\gzwrite.c" /> 586 <ClCompile Include="..\..\..\gzwrite.c" />
603 <ClCompile Include="..\..\..\infback.c" /> 587 <ClCompile Include="..\..\..\infback.c" />
604 <ClCompile Include="..\..\masmx64\inffas8664.c">
605 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
606 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
607 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
608 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
609 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
610 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
611 </ClCompile>
612 <ClCompile Include="..\..\..\inffast.c" /> 588 <ClCompile Include="..\..\..\inffast.c" />
613 <ClCompile Include="..\..\..\inflate.c" /> 589 <ClCompile Include="..\..\..\inflate.c" />
614 <ClCompile Include="..\..\..\inftrees.c" /> 590 <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/contrib/vstudio/vc10/zlibvc.vcxproj.filters b/contrib/vstudio/vc10/zlibvc.vcxproj.filters
index 180b71c..67c444a 100644
--- a/contrib/vstudio/vc10/zlibvc.vcxproj.filters
+++ b/contrib/vstudio/vc10/zlibvc.vcxproj.filters
@@ -42,9 +42,6 @@
42 <ClCompile Include="..\..\..\infback.c"> 42 <ClCompile Include="..\..\..\infback.c">
43 <Filter>Source Files</Filter> 43 <Filter>Source Files</Filter>
44 </ClCompile> 44 </ClCompile>
45 <ClCompile Include="..\..\masmx64\inffas8664.c">
46 <Filter>Source Files</Filter>
47 </ClCompile>
48 <ClCompile Include="..\..\..\inffast.c"> 45 <ClCompile Include="..\..\..\inffast.c">
49 <Filter>Source Files</Filter> 46 <Filter>Source Files</Filter>
50 </ClCompile> 47 </ClCompile>