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/vc11 | |
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/vc11')
-rw-r--r-- | contrib/vstudio/vc11/testzlib.vcxproj | 24 | ||||
-rw-r--r-- | contrib/vstudio/vc11/zlibstat.vcxproj | 34 | ||||
-rw-r--r-- | contrib/vstudio/vc11/zlibvc.vcxproj | 58 |
3 files changed, 38 insertions, 78 deletions
diff --git a/contrib/vstudio/vc11/testzlib.vcxproj b/contrib/vstudio/vc11/testzlib.vcxproj index 6d55954..c6198c1 100644 --- a/contrib/vstudio/vc11/testzlib.vcxproj +++ b/contrib/vstudio/vc11/testzlib.vcxproj | |||
@@ -187,7 +187,7 @@ | |||
187 | <ClCompile> | 187 | <ClCompile> |
188 | <Optimization>Disabled</Optimization> | 188 | <Optimization>Disabled</Optimization> |
189 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 189 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
190 | <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 190 | <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
191 | <MinimalRebuild>true</MinimalRebuild> | 191 | <MinimalRebuild>true</MinimalRebuild> |
192 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | 192 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> |
193 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | 193 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
@@ -200,7 +200,7 @@ | |||
200 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | 200 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
201 | </ClCompile> | 201 | </ClCompile> |
202 | <Link> | 202 | <Link> |
203 | <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> | 203 | <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> |
204 | <OutputFile>$(OutDir)testzlib.exe</OutputFile> | 204 | <OutputFile>$(OutDir)testzlib.exe</OutputFile> |
205 | <GenerateDebugInformation>true</GenerateDebugInformation> | 205 | <GenerateDebugInformation>true</GenerateDebugInformation> |
206 | <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile> | 206 | <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile> |
@@ -247,7 +247,7 @@ | |||
247 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 247 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
248 | <OmitFramePointers>true</OmitFramePointers> | 248 | <OmitFramePointers>true</OmitFramePointers> |
249 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 249 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
250 | <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 250 | <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
251 | <StringPooling>true</StringPooling> | 251 | <StringPooling>true</StringPooling> |
252 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | 252 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> |
253 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | 253 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
@@ -260,7 +260,7 @@ | |||
260 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | 260 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
261 | </ClCompile> | 261 | </ClCompile> |
262 | <Link> | 262 | <Link> |
263 | <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> | 263 | <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> |
264 | <OutputFile>$(OutDir)testzlib.exe</OutputFile> | 264 | <OutputFile>$(OutDir)testzlib.exe</OutputFile> |
265 | <GenerateDebugInformation>true</GenerateDebugInformation> | 265 | <GenerateDebugInformation>true</GenerateDebugInformation> |
266 | <SubSystem>Console</SubSystem> | 266 | <SubSystem>Console</SubSystem> |
@@ -275,14 +275,14 @@ | |||
275 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | 275 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
276 | <ClCompile> | 276 | <ClCompile> |
277 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 277 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
278 | <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 278 | <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
279 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | 279 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> |
280 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | 280 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
281 | <BufferSecurityCheck>false</BufferSecurityCheck> | 281 | <BufferSecurityCheck>false</BufferSecurityCheck> |
282 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | 282 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> |
283 | </ClCompile> | 283 | </ClCompile> |
284 | <Link> | 284 | <Link> |
285 | <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> | 285 | <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> |
286 | </Link> | 286 | </Link> |
287 | </ItemDefinitionGroup> | 287 | </ItemDefinitionGroup> |
288 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> | 288 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> |
@@ -358,14 +358,14 @@ | |||
358 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | 358 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> |
359 | <ClCompile> | 359 | <ClCompile> |
360 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 360 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
361 | <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 361 | <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
362 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | 362 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> |
363 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | 363 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> |
364 | <BufferSecurityCheck>false</BufferSecurityCheck> | 364 | <BufferSecurityCheck>false</BufferSecurityCheck> |
365 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | 365 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> |
366 | </ClCompile> | 366 | </ClCompile> |
367 | <Link> | 367 | <Link> |
368 | <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> | 368 | <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> |
369 | </Link> | 369 | </Link> |
370 | </ItemDefinitionGroup> | 370 | </ItemDefinitionGroup> |
371 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> | 371 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> |
@@ -404,14 +404,6 @@ | |||
404 | <ClCompile Include="..\..\..\crc32.c" /> | 404 | <ClCompile Include="..\..\..\crc32.c" /> |
405 | <ClCompile Include="..\..\..\deflate.c" /> | 405 | <ClCompile Include="..\..\..\deflate.c" /> |
406 | <ClCompile Include="..\..\..\infback.c" /> | 406 | <ClCompile Include="..\..\..\infback.c" /> |
407 | <ClCompile Include="..\..\masmx64\inffas8664.c"> | ||
408 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild> | ||
409 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> | ||
410 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild> | ||
411 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild> | ||
412 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild> | ||
413 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> | ||
414 | </ClCompile> | ||
415 | <ClCompile Include="..\..\..\inffast.c" /> | 407 | <ClCompile Include="..\..\..\inffast.c" /> |
416 | <ClCompile Include="..\..\..\inflate.c" /> | 408 | <ClCompile Include="..\..\..\inflate.c" /> |
417 | <ClCompile Include="..\..\..\inftrees.c" /> | 409 | <ClCompile Include="..\..\..\inftrees.c" /> |
diff --git a/contrib/vstudio/vc11/zlibstat.vcxproj b/contrib/vstudio/vc11/zlibstat.vcxproj index 806b76a..86fb1c8 100644 --- a/contrib/vstudio/vc11/zlibstat.vcxproj +++ b/contrib/vstudio/vc11/zlibstat.vcxproj | |||
@@ -167,7 +167,7 @@ | |||
167 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | 167 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
168 | <ClCompile> | 168 | <ClCompile> |
169 | <Optimization>Disabled</Optimization> | 169 | <Optimization>Disabled</Optimization> |
170 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 170 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
171 | <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 171 | <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
172 | <ExceptionHandling> | 172 | <ExceptionHandling> |
173 | </ExceptionHandling> | 173 | </ExceptionHandling> |
@@ -193,8 +193,8 @@ | |||
193 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | 193 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
194 | <ClCompile> | 194 | <ClCompile> |
195 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 195 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
196 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 196 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
197 | <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 197 | <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
198 | <StringPooling>true</StringPooling> | 198 | <StringPooling>true</StringPooling> |
199 | <ExceptionHandling> | 199 | <ExceptionHandling> |
200 | </ExceptionHandling> | 200 | </ExceptionHandling> |
@@ -213,7 +213,7 @@ | |||
213 | </ResourceCompile> | 213 | </ResourceCompile> |
214 | <Lib> | 214 | <Lib> |
215 | <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> | 215 | <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> |
216 | <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> | 216 | <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> |
217 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> | 217 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> |
218 | <SuppressStartupBanner>true</SuppressStartupBanner> | 218 | <SuppressStartupBanner>true</SuppressStartupBanner> |
219 | </Lib> | 219 | </Lib> |
@@ -221,7 +221,7 @@ | |||
221 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> | 221 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> |
222 | <ClCompile> | 222 | <ClCompile> |
223 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 223 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
224 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 224 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
225 | <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 225 | <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
226 | <StringPooling>true</StringPooling> | 226 | <StringPooling>true</StringPooling> |
227 | <ExceptionHandling> | 227 | <ExceptionHandling> |
@@ -251,7 +251,7 @@ | |||
251 | </Midl> | 251 | </Midl> |
252 | <ClCompile> | 252 | <ClCompile> |
253 | <Optimization>Disabled</Optimization> | 253 | <Optimization>Disabled</Optimization> |
254 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 254 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
255 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 255 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
256 | <ExceptionHandling> | 256 | <ExceptionHandling> |
257 | </ExceptionHandling> | 257 | </ExceptionHandling> |
@@ -280,7 +280,7 @@ | |||
280 | </Midl> | 280 | </Midl> |
281 | <ClCompile> | 281 | <ClCompile> |
282 | <Optimization>Disabled</Optimization> | 282 | <Optimization>Disabled</Optimization> |
283 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 283 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
284 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 284 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
285 | <ExceptionHandling> | 285 | <ExceptionHandling> |
286 | </ExceptionHandling> | 286 | </ExceptionHandling> |
@@ -309,8 +309,8 @@ | |||
309 | </Midl> | 309 | </Midl> |
310 | <ClCompile> | 310 | <ClCompile> |
311 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 311 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
312 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 312 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
313 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 313 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
314 | <StringPooling>true</StringPooling> | 314 | <StringPooling>true</StringPooling> |
315 | <ExceptionHandling> | 315 | <ExceptionHandling> |
316 | </ExceptionHandling> | 316 | </ExceptionHandling> |
@@ -329,7 +329,7 @@ | |||
329 | </ResourceCompile> | 329 | </ResourceCompile> |
330 | <Lib> | 330 | <Lib> |
331 | <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> | 331 | <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> |
332 | <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> | 332 | <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> |
333 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> | 333 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> |
334 | <SuppressStartupBanner>true</SuppressStartupBanner> | 334 | <SuppressStartupBanner>true</SuppressStartupBanner> |
335 | </Lib> | 335 | </Lib> |
@@ -340,7 +340,7 @@ | |||
340 | </Midl> | 340 | </Midl> |
341 | <ClCompile> | 341 | <ClCompile> |
342 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 342 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
343 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 343 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
344 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 344 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
345 | <StringPooling>true</StringPooling> | 345 | <StringPooling>true</StringPooling> |
346 | <ExceptionHandling> | 346 | <ExceptionHandling> |
@@ -370,7 +370,7 @@ | |||
370 | </Midl> | 370 | </Midl> |
371 | <ClCompile> | 371 | <ClCompile> |
372 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 372 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
373 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 373 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
374 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 374 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
375 | <StringPooling>true</StringPooling> | 375 | <StringPooling>true</StringPooling> |
376 | <ExceptionHandling> | 376 | <ExceptionHandling> |
@@ -400,7 +400,7 @@ | |||
400 | </Midl> | 400 | </Midl> |
401 | <ClCompile> | 401 | <ClCompile> |
402 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 402 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
403 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 403 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
404 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 404 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
405 | <StringPooling>true</StringPooling> | 405 | <StringPooling>true</StringPooling> |
406 | <ExceptionHandling> | 406 | <ExceptionHandling> |
@@ -434,14 +434,6 @@ | |||
434 | <ClCompile Include="..\..\..\gzread.c" /> | 434 | <ClCompile Include="..\..\..\gzread.c" /> |
435 | <ClCompile Include="..\..\..\gzwrite.c" /> | 435 | <ClCompile Include="..\..\..\gzwrite.c" /> |
436 | <ClCompile Include="..\..\..\infback.c" /> | 436 | <ClCompile Include="..\..\..\infback.c" /> |
437 | <ClCompile Include="..\..\masmx64\inffas8664.c"> | ||
438 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild> | ||
439 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> | ||
440 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild> | ||
441 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild> | ||
442 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild> | ||
443 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> | ||
444 | </ClCompile> | ||
445 | <ClCompile Include="..\..\..\inffast.c" /> | 437 | <ClCompile Include="..\..\..\inffast.c" /> |
446 | <ClCompile Include="..\..\..\inflate.c" /> | 438 | <ClCompile Include="..\..\..\inflate.c" /> |
447 | <ClCompile Include="..\..\..\inftrees.c" /> | 439 | <ClCompile Include="..\..\..\inftrees.c" /> |
diff --git a/contrib/vstudio/vc11/zlibvc.vcxproj b/contrib/vstudio/vc11/zlibvc.vcxproj index c65b95f..fc8cd9c 100644 --- a/contrib/vstudio/vc11/zlibvc.vcxproj +++ b/contrib/vstudio/vc11/zlibvc.vcxproj | |||
@@ -204,8 +204,8 @@ | |||
204 | </Midl> | 204 | </Midl> |
205 | <ClCompile> | 205 | <ClCompile> |
206 | <Optimization>Disabled</Optimization> | 206 | <Optimization>Disabled</Optimization> |
207 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 207 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
208 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 208 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
209 | <ExceptionHandling> | 209 | <ExceptionHandling> |
210 | </ExceptionHandling> | 210 | </ExceptionHandling> |
211 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | 211 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
@@ -226,7 +226,7 @@ | |||
226 | </ResourceCompile> | 226 | </ResourceCompile> |
227 | <Link> | 227 | <Link> |
228 | <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> | 228 | <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> |
229 | <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> | 229 | <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> |
230 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> | 230 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> |
231 | <SuppressStartupBanner>true</SuppressStartupBanner> | 231 | <SuppressStartupBanner>true</SuppressStartupBanner> |
232 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> | 232 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> |
@@ -240,10 +240,6 @@ | |||
240 | </DataExecutionPrevention> | 240 | </DataExecutionPrevention> |
241 | <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> | 241 | <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> |
242 | </Link> | 242 | </Link> |
243 | <PreBuildEvent> | ||
244 | <Command>cd ..\..\masmx86 | ||
245 | bld_ml32.bat</Command> | ||
246 | </PreBuildEvent> | ||
247 | </ItemDefinitionGroup> | 243 | </ItemDefinitionGroup> |
248 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> | 244 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> |
249 | <Midl> | 245 | <Midl> |
@@ -255,7 +251,7 @@ bld_ml32.bat</Command> | |||
255 | </Midl> | 251 | </Midl> |
256 | <ClCompile> | 252 | <ClCompile> |
257 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 253 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
258 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 254 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
259 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 255 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
260 | <StringPooling>true</StringPooling> | 256 | <StringPooling>true</StringPooling> |
261 | <ExceptionHandling> | 257 | <ExceptionHandling> |
@@ -303,8 +299,8 @@ bld_ml32.bat</Command> | |||
303 | </Midl> | 299 | </Midl> |
304 | <ClCompile> | 300 | <ClCompile> |
305 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 301 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
306 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 302 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
307 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 303 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
308 | <StringPooling>true</StringPooling> | 304 | <StringPooling>true</StringPooling> |
309 | <ExceptionHandling> | 305 | <ExceptionHandling> |
310 | </ExceptionHandling> | 306 | </ExceptionHandling> |
@@ -327,7 +323,7 @@ bld_ml32.bat</Command> | |||
327 | </ResourceCompile> | 323 | </ResourceCompile> |
328 | <Link> | 324 | <Link> |
329 | <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> | 325 | <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> |
330 | <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> | 326 | <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> |
331 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> | 327 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> |
332 | <SuppressStartupBanner>true</SuppressStartupBanner> | 328 | <SuppressStartupBanner>true</SuppressStartupBanner> |
333 | <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> | 329 | <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> |
@@ -341,10 +337,6 @@ bld_ml32.bat</Command> | |||
341 | </DataExecutionPrevention> | 337 | </DataExecutionPrevention> |
342 | <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> | 338 | <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> |
343 | </Link> | 339 | </Link> |
344 | <PreBuildEvent> | ||
345 | <Command>cd ..\..\masmx86 | ||
346 | bld_ml32.bat</Command> | ||
347 | </PreBuildEvent> | ||
348 | </ItemDefinitionGroup> | 340 | </ItemDefinitionGroup> |
349 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | 341 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
350 | <Midl> | 342 | <Midl> |
@@ -356,8 +348,8 @@ bld_ml32.bat</Command> | |||
356 | </Midl> | 348 | </Midl> |
357 | <ClCompile> | 349 | <ClCompile> |
358 | <Optimization>Disabled</Optimization> | 350 | <Optimization>Disabled</Optimization> |
359 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 351 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
360 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 352 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
361 | <ExceptionHandling> | 353 | <ExceptionHandling> |
362 | </ExceptionHandling> | 354 | </ExceptionHandling> |
363 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | 355 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
@@ -377,7 +369,7 @@ bld_ml32.bat</Command> | |||
377 | <Culture>0x040c</Culture> | 369 | <Culture>0x040c</Culture> |
378 | </ResourceCompile> | 370 | </ResourceCompile> |
379 | <Link> | 371 | <Link> |
380 | <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> | 372 | <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> |
381 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> | 373 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> |
382 | <SuppressStartupBanner>true</SuppressStartupBanner> | 374 | <SuppressStartupBanner>true</SuppressStartupBanner> |
383 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> | 375 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> |
@@ -389,10 +381,6 @@ bld_ml32.bat</Command> | |||
389 | <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> | 381 | <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> |
390 | <TargetMachine>MachineX64</TargetMachine> | 382 | <TargetMachine>MachineX64</TargetMachine> |
391 | </Link> | 383 | </Link> |
392 | <PreBuildEvent> | ||
393 | <Command>cd ..\..\contrib\masmx64 | ||
394 | bld_ml64.bat</Command> | ||
395 | </PreBuildEvent> | ||
396 | </ItemDefinitionGroup> | 384 | </ItemDefinitionGroup> |
397 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> | 385 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> |
398 | <Midl> | 386 | <Midl> |
@@ -404,7 +392,7 @@ bld_ml64.bat</Command> | |||
404 | </Midl> | 392 | </Midl> |
405 | <ClCompile> | 393 | <ClCompile> |
406 | <Optimization>Disabled</Optimization> | 394 | <Optimization>Disabled</Optimization> |
407 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 395 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
408 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 396 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
409 | <ExceptionHandling> | 397 | <ExceptionHandling> |
410 | </ExceptionHandling> | 398 | </ExceptionHandling> |
@@ -447,7 +435,7 @@ bld_ml64.bat</Command> | |||
447 | </Midl> | 435 | </Midl> |
448 | <ClCompile> | 436 | <ClCompile> |
449 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 437 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
450 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 438 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
451 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 439 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
452 | <StringPooling>true</StringPooling> | 440 | <StringPooling>true</StringPooling> |
453 | <ExceptionHandling> | 441 | <ExceptionHandling> |
@@ -492,7 +480,7 @@ bld_ml64.bat</Command> | |||
492 | </Midl> | 480 | </Midl> |
493 | <ClCompile> | 481 | <ClCompile> |
494 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 482 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
495 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 483 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
496 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 484 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
497 | <StringPooling>true</StringPooling> | 485 | <StringPooling>true</StringPooling> |
498 | <ExceptionHandling> | 486 | <ExceptionHandling> |
@@ -537,8 +525,8 @@ bld_ml64.bat</Command> | |||
537 | </Midl> | 525 | </Midl> |
538 | <ClCompile> | 526 | <ClCompile> |
539 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 527 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
540 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 528 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
541 | <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 529 | <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
542 | <StringPooling>true</StringPooling> | 530 | <StringPooling>true</StringPooling> |
543 | <ExceptionHandling> | 531 | <ExceptionHandling> |
544 | </ExceptionHandling> | 532 | </ExceptionHandling> |
@@ -560,7 +548,7 @@ bld_ml64.bat</Command> | |||
560 | <Culture>0x040c</Culture> | 548 | <Culture>0x040c</Culture> |
561 | </ResourceCompile> | 549 | </ResourceCompile> |
562 | <Link> | 550 | <Link> |
563 | <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> | 551 | <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> |
564 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> | 552 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> |
565 | <SuppressStartupBanner>true</SuppressStartupBanner> | 553 | <SuppressStartupBanner>true</SuppressStartupBanner> |
566 | <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> | 554 | <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> |
@@ -572,10 +560,6 @@ bld_ml64.bat</Command> | |||
572 | <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> | 560 | <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> |
573 | <TargetMachine>MachineX64</TargetMachine> | 561 | <TargetMachine>MachineX64</TargetMachine> |
574 | </Link> | 562 | </Link> |
575 | <PreBuildEvent> | ||
576 | <Command>cd ..\..\masmx64 | ||
577 | bld_ml64.bat</Command> | ||
578 | </PreBuildEvent> | ||
579 | </ItemDefinitionGroup> | 563 | </ItemDefinitionGroup> |
580 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> | 564 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> |
581 | <Midl> | 565 | <Midl> |
@@ -587,7 +571,7 @@ bld_ml64.bat</Command> | |||
587 | </Midl> | 571 | </Midl> |
588 | <ClCompile> | 572 | <ClCompile> |
589 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 573 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
590 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 574 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
591 | <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 575 | <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
592 | <StringPooling>true</StringPooling> | 576 | <StringPooling>true</StringPooling> |
593 | <ExceptionHandling> | 577 | <ExceptionHandling> |
@@ -632,14 +616,6 @@ bld_ml64.bat</Command> | |||
632 | <ClCompile Include="..\..\..\gzread.c" /> | 616 | <ClCompile Include="..\..\..\gzread.c" /> |
633 | <ClCompile Include="..\..\..\gzwrite.c" /> | 617 | <ClCompile Include="..\..\..\gzwrite.c" /> |
634 | <ClCompile Include="..\..\..\infback.c" /> | 618 | <ClCompile Include="..\..\..\infback.c" /> |
635 | <ClCompile Include="..\..\masmx64\inffas8664.c"> | ||
636 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild> | ||
637 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> | ||
638 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild> | ||
639 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild> | ||
640 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild> | ||
641 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> | ||
642 | </ClCompile> | ||
643 | <ClCompile Include="..\..\..\inffast.c" /> | 619 | <ClCompile Include="..\..\..\inffast.c" /> |
644 | <ClCompile Include="..\..\..\inflate.c" /> | 620 | <ClCompile Include="..\..\..\inflate.c" /> |
645 | <ClCompile Include="..\..\..\inftrees.c" /> | 621 | <ClCompile Include="..\..\..\inftrees.c" /> |