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/vc12 | |
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/vc12')
-rw-r--r-- | contrib/vstudio/vc12/testzlib.vcxproj | 24 | ||||
-rw-r--r-- | contrib/vstudio/vc12/zlibstat.vcxproj | 34 | ||||
-rw-r--r-- | contrib/vstudio/vc12/zlibvc.vcxproj | 58 |
3 files changed, 38 insertions, 78 deletions
diff --git a/contrib/vstudio/vc12/testzlib.vcxproj b/contrib/vstudio/vc12/testzlib.vcxproj index 64b2cbe..41303c0 100644 --- a/contrib/vstudio/vc12/testzlib.vcxproj +++ b/contrib/vstudio/vc12/testzlib.vcxproj | |||
@@ -190,7 +190,7 @@ | |||
190 | <ClCompile> | 190 | <ClCompile> |
191 | <Optimization>Disabled</Optimization> | 191 | <Optimization>Disabled</Optimization> |
192 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 192 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
193 | <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 193 | <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
194 | <MinimalRebuild>true</MinimalRebuild> | 194 | <MinimalRebuild>true</MinimalRebuild> |
195 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | 195 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> |
196 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | 196 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
@@ -203,7 +203,7 @@ | |||
203 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | 203 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
204 | </ClCompile> | 204 | </ClCompile> |
205 | <Link> | 205 | <Link> |
206 | <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> | 206 | <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> |
207 | <OutputFile>$(OutDir)testzlib.exe</OutputFile> | 207 | <OutputFile>$(OutDir)testzlib.exe</OutputFile> |
208 | <GenerateDebugInformation>true</GenerateDebugInformation> | 208 | <GenerateDebugInformation>true</GenerateDebugInformation> |
209 | <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile> | 209 | <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile> |
@@ -250,7 +250,7 @@ | |||
250 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 250 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
251 | <OmitFramePointers>true</OmitFramePointers> | 251 | <OmitFramePointers>true</OmitFramePointers> |
252 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 252 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
253 | <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 253 | <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
254 | <StringPooling>true</StringPooling> | 254 | <StringPooling>true</StringPooling> |
255 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | 255 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> |
256 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | 256 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
@@ -263,7 +263,7 @@ | |||
263 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | 263 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
264 | </ClCompile> | 264 | </ClCompile> |
265 | <Link> | 265 | <Link> |
266 | <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> | 266 | <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> |
267 | <OutputFile>$(OutDir)testzlib.exe</OutputFile> | 267 | <OutputFile>$(OutDir)testzlib.exe</OutputFile> |
268 | <GenerateDebugInformation>true</GenerateDebugInformation> | 268 | <GenerateDebugInformation>true</GenerateDebugInformation> |
269 | <SubSystem>Console</SubSystem> | 269 | <SubSystem>Console</SubSystem> |
@@ -279,14 +279,14 @@ | |||
279 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | 279 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
280 | <ClCompile> | 280 | <ClCompile> |
281 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 281 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
282 | <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 282 | <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
283 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | 283 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> |
284 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | 284 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
285 | <BufferSecurityCheck>false</BufferSecurityCheck> | 285 | <BufferSecurityCheck>false</BufferSecurityCheck> |
286 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | 286 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> |
287 | </ClCompile> | 287 | </ClCompile> |
288 | <Link> | 288 | <Link> |
289 | <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> | 289 | <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> |
290 | </Link> | 290 | </Link> |
291 | </ItemDefinitionGroup> | 291 | </ItemDefinitionGroup> |
292 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> | 292 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> |
@@ -362,14 +362,14 @@ | |||
362 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | 362 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> |
363 | <ClCompile> | 363 | <ClCompile> |
364 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 364 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
365 | <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 365 | <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
366 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | 366 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> |
367 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | 367 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> |
368 | <BufferSecurityCheck>false</BufferSecurityCheck> | 368 | <BufferSecurityCheck>false</BufferSecurityCheck> |
369 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | 369 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> |
370 | </ClCompile> | 370 | </ClCompile> |
371 | <Link> | 371 | <Link> |
372 | <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> | 372 | <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> |
373 | </Link> | 373 | </Link> |
374 | </ItemDefinitionGroup> | 374 | </ItemDefinitionGroup> |
375 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> | 375 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> |
@@ -408,14 +408,6 @@ | |||
408 | <ClCompile Include="..\..\..\crc32.c" /> | 408 | <ClCompile Include="..\..\..\crc32.c" /> |
409 | <ClCompile Include="..\..\..\deflate.c" /> | 409 | <ClCompile Include="..\..\..\deflate.c" /> |
410 | <ClCompile Include="..\..\..\infback.c" /> | 410 | <ClCompile Include="..\..\..\infback.c" /> |
411 | <ClCompile Include="..\..\masmx64\inffas8664.c"> | ||
412 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild> | ||
413 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> | ||
414 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild> | ||
415 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild> | ||
416 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild> | ||
417 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> | ||
418 | </ClCompile> | ||
419 | <ClCompile Include="..\..\..\inffast.c" /> | 411 | <ClCompile Include="..\..\..\inffast.c" /> |
420 | <ClCompile Include="..\..\..\inflate.c" /> | 412 | <ClCompile Include="..\..\..\inflate.c" /> |
421 | <ClCompile Include="..\..\..\inftrees.c" /> | 413 | <ClCompile Include="..\..\..\inftrees.c" /> |
diff --git a/contrib/vstudio/vc12/zlibstat.vcxproj b/contrib/vstudio/vc12/zlibstat.vcxproj index 3fdee7c..6629d8e 100644 --- a/contrib/vstudio/vc12/zlibstat.vcxproj +++ b/contrib/vstudio/vc12/zlibstat.vcxproj | |||
@@ -170,7 +170,7 @@ | |||
170 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | 170 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
171 | <ClCompile> | 171 | <ClCompile> |
172 | <Optimization>Disabled</Optimization> | 172 | <Optimization>Disabled</Optimization> |
173 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 173 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
174 | <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 174 | <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
175 | <ExceptionHandling> | 175 | <ExceptionHandling> |
176 | </ExceptionHandling> | 176 | </ExceptionHandling> |
@@ -196,8 +196,8 @@ | |||
196 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | 196 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
197 | <ClCompile> | 197 | <ClCompile> |
198 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 198 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
199 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 199 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
200 | <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 200 | <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
201 | <StringPooling>true</StringPooling> | 201 | <StringPooling>true</StringPooling> |
202 | <ExceptionHandling> | 202 | <ExceptionHandling> |
203 | </ExceptionHandling> | 203 | </ExceptionHandling> |
@@ -216,7 +216,7 @@ | |||
216 | </ResourceCompile> | 216 | </ResourceCompile> |
217 | <Lib> | 217 | <Lib> |
218 | <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> | 218 | <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> |
219 | <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> | 219 | <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> |
220 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> | 220 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> |
221 | <SuppressStartupBanner>true</SuppressStartupBanner> | 221 | <SuppressStartupBanner>true</SuppressStartupBanner> |
222 | </Lib> | 222 | </Lib> |
@@ -224,7 +224,7 @@ | |||
224 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> | 224 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> |
225 | <ClCompile> | 225 | <ClCompile> |
226 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 226 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
227 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 227 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
228 | <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 228 | <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
229 | <StringPooling>true</StringPooling> | 229 | <StringPooling>true</StringPooling> |
230 | <ExceptionHandling> | 230 | <ExceptionHandling> |
@@ -254,7 +254,7 @@ | |||
254 | </Midl> | 254 | </Midl> |
255 | <ClCompile> | 255 | <ClCompile> |
256 | <Optimization>Disabled</Optimization> | 256 | <Optimization>Disabled</Optimization> |
257 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 257 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
258 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 258 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
259 | <ExceptionHandling> | 259 | <ExceptionHandling> |
260 | </ExceptionHandling> | 260 | </ExceptionHandling> |
@@ -283,7 +283,7 @@ | |||
283 | </Midl> | 283 | </Midl> |
284 | <ClCompile> | 284 | <ClCompile> |
285 | <Optimization>Disabled</Optimization> | 285 | <Optimization>Disabled</Optimization> |
286 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 286 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
287 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 287 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
288 | <ExceptionHandling> | 288 | <ExceptionHandling> |
289 | </ExceptionHandling> | 289 | </ExceptionHandling> |
@@ -312,8 +312,8 @@ | |||
312 | </Midl> | 312 | </Midl> |
313 | <ClCompile> | 313 | <ClCompile> |
314 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 314 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
315 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 315 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
316 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 316 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
317 | <StringPooling>true</StringPooling> | 317 | <StringPooling>true</StringPooling> |
318 | <ExceptionHandling> | 318 | <ExceptionHandling> |
319 | </ExceptionHandling> | 319 | </ExceptionHandling> |
@@ -332,7 +332,7 @@ | |||
332 | </ResourceCompile> | 332 | </ResourceCompile> |
333 | <Lib> | 333 | <Lib> |
334 | <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> | 334 | <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> |
335 | <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> | 335 | <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> |
336 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> | 336 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> |
337 | <SuppressStartupBanner>true</SuppressStartupBanner> | 337 | <SuppressStartupBanner>true</SuppressStartupBanner> |
338 | </Lib> | 338 | </Lib> |
@@ -343,7 +343,7 @@ | |||
343 | </Midl> | 343 | </Midl> |
344 | <ClCompile> | 344 | <ClCompile> |
345 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 345 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
346 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 346 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
347 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 347 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
348 | <StringPooling>true</StringPooling> | 348 | <StringPooling>true</StringPooling> |
349 | <ExceptionHandling> | 349 | <ExceptionHandling> |
@@ -373,7 +373,7 @@ | |||
373 | </Midl> | 373 | </Midl> |
374 | <ClCompile> | 374 | <ClCompile> |
375 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 375 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
376 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 376 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
377 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 377 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
378 | <StringPooling>true</StringPooling> | 378 | <StringPooling>true</StringPooling> |
379 | <ExceptionHandling> | 379 | <ExceptionHandling> |
@@ -403,7 +403,7 @@ | |||
403 | </Midl> | 403 | </Midl> |
404 | <ClCompile> | 404 | <ClCompile> |
405 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 405 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
406 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 406 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
407 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 407 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
408 | <StringPooling>true</StringPooling> | 408 | <StringPooling>true</StringPooling> |
409 | <ExceptionHandling> | 409 | <ExceptionHandling> |
@@ -437,14 +437,6 @@ | |||
437 | <ClCompile Include="..\..\..\gzread.c" /> | 437 | <ClCompile Include="..\..\..\gzread.c" /> |
438 | <ClCompile Include="..\..\..\gzwrite.c" /> | 438 | <ClCompile Include="..\..\..\gzwrite.c" /> |
439 | <ClCompile Include="..\..\..\infback.c" /> | 439 | <ClCompile Include="..\..\..\infback.c" /> |
440 | <ClCompile Include="..\..\masmx64\inffas8664.c"> | ||
441 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild> | ||
442 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> | ||
443 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild> | ||
444 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild> | ||
445 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild> | ||
446 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> | ||
447 | </ClCompile> | ||
448 | <ClCompile Include="..\..\..\inffast.c" /> | 440 | <ClCompile Include="..\..\..\inffast.c" /> |
449 | <ClCompile Include="..\..\..\inflate.c" /> | 441 | <ClCompile Include="..\..\..\inflate.c" /> |
450 | <ClCompile Include="..\..\..\inftrees.c" /> | 442 | <ClCompile Include="..\..\..\inftrees.c" /> |
diff --git a/contrib/vstudio/vc12/zlibvc.vcxproj b/contrib/vstudio/vc12/zlibvc.vcxproj index ab2b6c3..4e0de69 100644 --- a/contrib/vstudio/vc12/zlibvc.vcxproj +++ b/contrib/vstudio/vc12/zlibvc.vcxproj | |||
@@ -207,8 +207,8 @@ | |||
207 | </Midl> | 207 | </Midl> |
208 | <ClCompile> | 208 | <ClCompile> |
209 | <Optimization>Disabled</Optimization> | 209 | <Optimization>Disabled</Optimization> |
210 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 210 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
211 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 211 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
212 | <ExceptionHandling> | 212 | <ExceptionHandling> |
213 | </ExceptionHandling> | 213 | </ExceptionHandling> |
214 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | 214 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
@@ -229,7 +229,7 @@ | |||
229 | </ResourceCompile> | 229 | </ResourceCompile> |
230 | <Link> | 230 | <Link> |
231 | <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> | 231 | <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> |
232 | <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> | 232 | <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> |
233 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> | 233 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> |
234 | <SuppressStartupBanner>true</SuppressStartupBanner> | 234 | <SuppressStartupBanner>true</SuppressStartupBanner> |
235 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> | 235 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> |
@@ -243,10 +243,6 @@ | |||
243 | </DataExecutionPrevention> | 243 | </DataExecutionPrevention> |
244 | <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> | 244 | <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> |
245 | </Link> | 245 | </Link> |
246 | <PreBuildEvent> | ||
247 | <Command>cd ..\..\masmx86 | ||
248 | bld_ml32.bat</Command> | ||
249 | </PreBuildEvent> | ||
250 | </ItemDefinitionGroup> | 246 | </ItemDefinitionGroup> |
251 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> | 247 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> |
252 | <Midl> | 248 | <Midl> |
@@ -258,7 +254,7 @@ bld_ml32.bat</Command> | |||
258 | </Midl> | 254 | </Midl> |
259 | <ClCompile> | 255 | <ClCompile> |
260 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 256 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
261 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 257 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
262 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 258 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
263 | <StringPooling>true</StringPooling> | 259 | <StringPooling>true</StringPooling> |
264 | <ExceptionHandling> | 260 | <ExceptionHandling> |
@@ -306,8 +302,8 @@ bld_ml32.bat</Command> | |||
306 | </Midl> | 302 | </Midl> |
307 | <ClCompile> | 303 | <ClCompile> |
308 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 304 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
309 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 305 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
310 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 306 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
311 | <StringPooling>true</StringPooling> | 307 | <StringPooling>true</StringPooling> |
312 | <ExceptionHandling> | 308 | <ExceptionHandling> |
313 | </ExceptionHandling> | 309 | </ExceptionHandling> |
@@ -330,7 +326,7 @@ bld_ml32.bat</Command> | |||
330 | </ResourceCompile> | 326 | </ResourceCompile> |
331 | <Link> | 327 | <Link> |
332 | <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> | 328 | <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> |
333 | <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> | 329 | <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> |
334 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> | 330 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> |
335 | <SuppressStartupBanner>true</SuppressStartupBanner> | 331 | <SuppressStartupBanner>true</SuppressStartupBanner> |
336 | <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> | 332 | <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> |
@@ -345,10 +341,6 @@ bld_ml32.bat</Command> | |||
345 | <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> | 341 | <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> |
346 | <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> | 342 | <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> |
347 | </Link> | 343 | </Link> |
348 | <PreBuildEvent> | ||
349 | <Command>cd ..\..\masmx86 | ||
350 | bld_ml32.bat</Command> | ||
351 | </PreBuildEvent> | ||
352 | </ItemDefinitionGroup> | 344 | </ItemDefinitionGroup> |
353 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | 345 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
354 | <Midl> | 346 | <Midl> |
@@ -360,8 +352,8 @@ bld_ml32.bat</Command> | |||
360 | </Midl> | 352 | </Midl> |
361 | <ClCompile> | 353 | <ClCompile> |
362 | <Optimization>Disabled</Optimization> | 354 | <Optimization>Disabled</Optimization> |
363 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 355 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
364 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 356 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
365 | <ExceptionHandling> | 357 | <ExceptionHandling> |
366 | </ExceptionHandling> | 358 | </ExceptionHandling> |
367 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | 359 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
@@ -381,7 +373,7 @@ bld_ml32.bat</Command> | |||
381 | <Culture>0x040c</Culture> | 373 | <Culture>0x040c</Culture> |
382 | </ResourceCompile> | 374 | </ResourceCompile> |
383 | <Link> | 375 | <Link> |
384 | <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> | 376 | <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> |
385 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> | 377 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> |
386 | <SuppressStartupBanner>true</SuppressStartupBanner> | 378 | <SuppressStartupBanner>true</SuppressStartupBanner> |
387 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> | 379 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> |
@@ -393,10 +385,6 @@ bld_ml32.bat</Command> | |||
393 | <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> | 385 | <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> |
394 | <TargetMachine>MachineX64</TargetMachine> | 386 | <TargetMachine>MachineX64</TargetMachine> |
395 | </Link> | 387 | </Link> |
396 | <PreBuildEvent> | ||
397 | <Command>cd ..\..\contrib\masmx64 | ||
398 | bld_ml64.bat</Command> | ||
399 | </PreBuildEvent> | ||
400 | </ItemDefinitionGroup> | 388 | </ItemDefinitionGroup> |
401 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> | 389 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> |
402 | <Midl> | 390 | <Midl> |
@@ -408,7 +396,7 @@ bld_ml64.bat</Command> | |||
408 | </Midl> | 396 | </Midl> |
409 | <ClCompile> | 397 | <ClCompile> |
410 | <Optimization>Disabled</Optimization> | 398 | <Optimization>Disabled</Optimization> |
411 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 399 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
412 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 400 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
413 | <ExceptionHandling> | 401 | <ExceptionHandling> |
414 | </ExceptionHandling> | 402 | </ExceptionHandling> |
@@ -451,7 +439,7 @@ bld_ml64.bat</Command> | |||
451 | </Midl> | 439 | </Midl> |
452 | <ClCompile> | 440 | <ClCompile> |
453 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 441 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
454 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 442 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
455 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 443 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
456 | <StringPooling>true</StringPooling> | 444 | <StringPooling>true</StringPooling> |
457 | <ExceptionHandling> | 445 | <ExceptionHandling> |
@@ -496,7 +484,7 @@ bld_ml64.bat</Command> | |||
496 | </Midl> | 484 | </Midl> |
497 | <ClCompile> | 485 | <ClCompile> |
498 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 486 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
499 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 487 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
500 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 488 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
501 | <StringPooling>true</StringPooling> | 489 | <StringPooling>true</StringPooling> |
502 | <ExceptionHandling> | 490 | <ExceptionHandling> |
@@ -541,8 +529,8 @@ bld_ml64.bat</Command> | |||
541 | </Midl> | 529 | </Midl> |
542 | <ClCompile> | 530 | <ClCompile> |
543 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 531 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
544 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 532 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
545 | <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 533 | <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
546 | <StringPooling>true</StringPooling> | 534 | <StringPooling>true</StringPooling> |
547 | <ExceptionHandling> | 535 | <ExceptionHandling> |
548 | </ExceptionHandling> | 536 | </ExceptionHandling> |
@@ -564,7 +552,7 @@ bld_ml64.bat</Command> | |||
564 | <Culture>0x040c</Culture> | 552 | <Culture>0x040c</Culture> |
565 | </ResourceCompile> | 553 | </ResourceCompile> |
566 | <Link> | 554 | <Link> |
567 | <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> | 555 | <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> |
568 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> | 556 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> |
569 | <SuppressStartupBanner>true</SuppressStartupBanner> | 557 | <SuppressStartupBanner>true</SuppressStartupBanner> |
570 | <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> | 558 | <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> |
@@ -576,10 +564,6 @@ bld_ml64.bat</Command> | |||
576 | <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> | 564 | <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> |
577 | <TargetMachine>MachineX64</TargetMachine> | 565 | <TargetMachine>MachineX64</TargetMachine> |
578 | </Link> | 566 | </Link> |
579 | <PreBuildEvent> | ||
580 | <Command>cd ..\..\masmx64 | ||
581 | bld_ml64.bat</Command> | ||
582 | </PreBuildEvent> | ||
583 | </ItemDefinitionGroup> | 567 | </ItemDefinitionGroup> |
584 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> | 568 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> |
585 | <Midl> | 569 | <Midl> |
@@ -591,7 +575,7 @@ bld_ml64.bat</Command> | |||
591 | </Midl> | 575 | </Midl> |
592 | <ClCompile> | 576 | <ClCompile> |
593 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 577 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
594 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 578 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
595 | <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 579 | <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
596 | <StringPooling>true</StringPooling> | 580 | <StringPooling>true</StringPooling> |
597 | <ExceptionHandling> | 581 | <ExceptionHandling> |
@@ -636,14 +620,6 @@ bld_ml64.bat</Command> | |||
636 | <ClCompile Include="..\..\..\gzread.c" /> | 620 | <ClCompile Include="..\..\..\gzread.c" /> |
637 | <ClCompile Include="..\..\..\gzwrite.c" /> | 621 | <ClCompile Include="..\..\..\gzwrite.c" /> |
638 | <ClCompile Include="..\..\..\infback.c" /> | 622 | <ClCompile Include="..\..\..\infback.c" /> |
639 | <ClCompile Include="..\..\masmx64\inffas8664.c"> | ||
640 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild> | ||
641 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> | ||
642 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild> | ||
643 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild> | ||
644 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild> | ||
645 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> | ||
646 | </ClCompile> | ||
647 | <ClCompile Include="..\..\..\inffast.c" /> | 623 | <ClCompile Include="..\..\..\inffast.c" /> |
648 | <ClCompile Include="..\..\..\inflate.c" /> | 624 | <ClCompile Include="..\..\..\inflate.c" /> |
649 | <ClCompile Include="..\..\..\inftrees.c" /> | 625 | <ClCompile Include="..\..\..\inftrees.c" /> |