Changes between Initial Version and Version 1 of AdminDepLibsZlib


Ignore:
Timestamp:
Jun 22, 2015, 9:36:32 PM (9 years ago)
Author:
romw
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • AdminDepLibsZlib

    v1 v1  
     1= Changes to zLib Project Files =
     2
     3== Release/x86 ==
     4
     5{{{
     6#!diff
     7--- "a/zlib\\contrib\\vstudio\\vc11\\zlibvc.vcxproj.orig"
     8+++ "b/zlib\\contrib\\vstudio\\vc11\\zlibvc.vcxproj"
     9@@ -1,5 +1,5 @@
     10 <?xml version="1.0" encoding="utf-8"?>
     11-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     12+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     13   <ItemGroup Label="ProjectConfigurations">
     14     <ProjectConfiguration Include="Debug|Itanium">
     15       <Configuration>Debug</Configuration>
     16@@ -46,50 +46,53 @@
     17     <ConfigurationType>DynamicLibrary</ConfigurationType>
     18     <UseOfMfc>false</UseOfMfc>
     19     <WholeProgramOptimization>true</WholeProgramOptimization>
     20-    <PlatformToolset>v110</PlatformToolset>
     21+    <PlatformToolset>v120</PlatformToolset>
     22   </PropertyGroup>
     23   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
     24     <ConfigurationType>DynamicLibrary</ConfigurationType>
     25     <UseOfMfc>false</UseOfMfc>
     26     <WholeProgramOptimization>true</WholeProgramOptimization>
     27-    <PlatformToolset>v110</PlatformToolset>
     28+    <PlatformToolset>v120_xp</PlatformToolset>
     29   </PropertyGroup>
     30   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     31     <ConfigurationType>DynamicLibrary</ConfigurationType>
     32     <UseOfMfc>false</UseOfMfc>
     33-    <PlatformToolset>v110</PlatformToolset>
     34+    <PlatformToolset>v120</PlatformToolset>
     35     <CharacterSet>Unicode</CharacterSet>
     36   </PropertyGroup>
     37   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
     38     <ConfigurationType>DynamicLibrary</ConfigurationType>
     39     <UseOfMfc>false</UseOfMfc>
     40     <WholeProgramOptimization>true</WholeProgramOptimization>
     41+    <PlatformToolset>v120</PlatformToolset>
     42   </PropertyGroup>
     43   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
     44     <ConfigurationType>DynamicLibrary</ConfigurationType>
     45     <UseOfMfc>false</UseOfMfc>
     46     <WholeProgramOptimization>true</WholeProgramOptimization>
     47+    <PlatformToolset>v120</PlatformToolset>
     48   </PropertyGroup>
     49   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
     50     <ConfigurationType>DynamicLibrary</ConfigurationType>
     51     <UseOfMfc>false</UseOfMfc>
     52+    <PlatformToolset>v120</PlatformToolset>
     53   </PropertyGroup>
     54   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     55     <ConfigurationType>DynamicLibrary</ConfigurationType>
     56     <UseOfMfc>false</UseOfMfc>
     57     <WholeProgramOptimization>true</WholeProgramOptimization>
     58-    <PlatformToolset>v110</PlatformToolset>
     59+    <PlatformToolset>v120</PlatformToolset>
     60   </PropertyGroup>
     61   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
     62     <ConfigurationType>DynamicLibrary</ConfigurationType>
     63     <UseOfMfc>false</UseOfMfc>
     64     <WholeProgramOptimization>true</WholeProgramOptimization>
     65-    <PlatformToolset>v110</PlatformToolset>
     66+    <PlatformToolset>v120</PlatformToolset>
     67   </PropertyGroup>
     68   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     69     <ConfigurationType>DynamicLibrary</ConfigurationType>
     70     <UseOfMfc>false</UseOfMfc>
     71-    <PlatformToolset>v110</PlatformToolset>
     72+    <PlatformToolset>v120_xp</PlatformToolset>
     73   </PropertyGroup>
     74   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
     75   <ImportGroup Label="ExtensionSettings">
     76@@ -188,7 +191,7 @@
     77     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     78     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     79     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapi</TargetName>
     80-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>
     81+    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlib1</TargetName>
     82     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>
     83     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapi</TargetName>
     84     <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>
     85@@ -279,18 +282,19 @@ bld_ml32.bat</Command>
     86     </ResourceCompile>
     87     <Link>
     88       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
     89-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
     90+      <OutputFile>$(OutDir)zlib1.dll</OutputFile>
     91       <SuppressStartupBanner>true</SuppressStartupBanner>
     92       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
     93       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
     94-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
     95+      <ProgramDatabaseFile>$(OutDir)zlib1.pdb</ProgramDatabaseFile>
     96       <GenerateMapFile>true</GenerateMapFile>
     97-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
     98+      <MapFileName>$(OutDir)zlib1.map</MapFileName>
     99       <SubSystem>Windows</SubSystem>
     100       <RandomizedBaseAddress>false</RandomizedBaseAddress>
     101       <DataExecutionPrevention>
     102       </DataExecutionPrevention>
     103-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
     104+      <ImportLibrary>$(OutDir)zlib1.lib</ImportLibrary>
     105+      <GenerateDebugInformation>true</GenerateDebugInformation>
     106     </Link>
     107   </ItemDefinitionGroup>
     108   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     109}}}
     110
     111== Debug/x86 ==
     112
     113{{{
     114#!diff
     115--- "a/zlib\\contrib\\vstudio\\vc11\\zlibvc.vcxproj.orig"
     116+++ "b/zlib\\contrib\\vstudio\\vc11\\zlibvc.vcxproj"
     117@@ -1,5 +1,5 @@
     118 <?xml version="1.0" encoding="utf-8"?>
     119-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     120+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     121   <ItemGroup Label="ProjectConfigurations">
     122     <ProjectConfiguration Include="Debug|Itanium">
     123       <Configuration>Debug</Configuration>
     124@@ -46,50 +46,53 @@
     125     <ConfigurationType>DynamicLibrary</ConfigurationType>
     126     <UseOfMfc>false</UseOfMfc>
     127     <WholeProgramOptimization>true</WholeProgramOptimization>
     128-    <PlatformToolset>v110</PlatformToolset>
     129+    <PlatformToolset>v120</PlatformToolset>
     130   </PropertyGroup>
     131   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
     132     <ConfigurationType>DynamicLibrary</ConfigurationType>
     133     <UseOfMfc>false</UseOfMfc>
     134     <WholeProgramOptimization>true</WholeProgramOptimization>
     135-    <PlatformToolset>v110</PlatformToolset>
     136+    <PlatformToolset>v120</PlatformToolset>
     137   </PropertyGroup>
     138   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     139     <ConfigurationType>DynamicLibrary</ConfigurationType>
     140     <UseOfMfc>false</UseOfMfc>
     141-    <PlatformToolset>v110</PlatformToolset>
     142+    <PlatformToolset>v120</PlatformToolset>
     143     <CharacterSet>Unicode</CharacterSet>
     144   </PropertyGroup>
     145   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
     146     <ConfigurationType>DynamicLibrary</ConfigurationType>
     147     <UseOfMfc>false</UseOfMfc>
     148     <WholeProgramOptimization>true</WholeProgramOptimization>
     149+    <PlatformToolset>v120</PlatformToolset>
     150   </PropertyGroup>
     151   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
     152     <ConfigurationType>DynamicLibrary</ConfigurationType>
     153     <UseOfMfc>false</UseOfMfc>
     154     <WholeProgramOptimization>true</WholeProgramOptimization>
     155+    <PlatformToolset>v120</PlatformToolset>
     156   </PropertyGroup>
     157   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
     158     <ConfigurationType>DynamicLibrary</ConfigurationType>
     159     <UseOfMfc>false</UseOfMfc>
     160+    <PlatformToolset>v120</PlatformToolset>
     161   </PropertyGroup>
     162   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     163     <ConfigurationType>DynamicLibrary</ConfigurationType>
     164     <UseOfMfc>false</UseOfMfc>
     165     <WholeProgramOptimization>true</WholeProgramOptimization>
     166-    <PlatformToolset>v110</PlatformToolset>
     167+    <PlatformToolset>v120</PlatformToolset>
     168   </PropertyGroup>
     169   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
     170     <ConfigurationType>DynamicLibrary</ConfigurationType>
     171     <UseOfMfc>false</UseOfMfc>
     172     <WholeProgramOptimization>true</WholeProgramOptimization>
     173-    <PlatformToolset>v110</PlatformToolset>
     174+    <PlatformToolset>v120_xp</PlatformToolset>
     175   </PropertyGroup>
     176   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     177     <ConfigurationType>DynamicLibrary</ConfigurationType>
     178     <UseOfMfc>false</UseOfMfc>
     179-    <PlatformToolset>v110</PlatformToolset>
     180+    <PlatformToolset>v120</PlatformToolset>
     181   </PropertyGroup>
     182   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
     183   <ImportGroup Label="ExtensionSettings">
     184@@ -187,8 +190,8 @@
     185     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     186     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     187     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     188-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapi</TargetName>
     189-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>
     190+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlib1</TargetName>
     191+    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlib1</TargetName>
     192     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>
     193     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapi</TargetName>
     194     <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>
     195@@ -204,8 +207,8 @@
     196     </Midl>
     197     <ClCompile>
     198       <Optimization>Disabled</Optimization>
     199-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     200-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     201+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     202+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     203       <ExceptionHandling>
     204       </ExceptionHandling>
     205       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     206@@ -226,19 +229,19 @@
     207     </ResourceCompile>
     208     <Link>
     209       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
     210-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
     211-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
     212+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
     213+      <OutputFile>$(OutDir)zlib1d.dll</OutputFile>
     214       <SuppressStartupBanner>true</SuppressStartupBanner>
     215       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
     216       <GenerateDebugInformation>true</GenerateDebugInformation>
     217-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
     218+      <ProgramDatabaseFile>$(OutDir)zlib1d.pdb</ProgramDatabaseFile>
     219       <GenerateMapFile>true</GenerateMapFile>
     220-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
     221+      <MapFileName>$(OutDir)zlib1d.map</MapFileName>
     222       <SubSystem>Windows</SubSystem>
     223       <RandomizedBaseAddress>false</RandomizedBaseAddress>
     224       <DataExecutionPrevention>
     225       </DataExecutionPrevention>
     226-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
     227+      <ImportLibrary>$(OutDir)zlib1d.lib</ImportLibrary>
     228     </Link>
     229     <PreBuildEvent>
     230       <Command>cd ..\..\masmx86
     231@@ -279,18 +282,19 @@ bld_ml32.bat</Command>
     232     </ResourceCompile>
     233     <Link>
     234       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
     235-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
     236+      <OutputFile>$(OutDir)zlib1.dll</OutputFile>
     237       <SuppressStartupBanner>true</SuppressStartupBanner>
     238       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
     239       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
     240-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
     241+      <ProgramDatabaseFile>$(OutDir)zlib1.pdb</ProgramDatabaseFile>
     242       <GenerateMapFile>true</GenerateMapFile>
     243-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
     244+      <MapFileName>$(OutDir)zlib1.map</MapFileName>
     245       <SubSystem>Windows</SubSystem>
     246       <RandomizedBaseAddress>false</RandomizedBaseAddress>
     247       <DataExecutionPrevention>
     248       </DataExecutionPrevention>
     249-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
     250+      <ImportLibrary>$(OutDir)zlib1.lib</ImportLibrary>
     251+      <GenerateDebugInformation>true</GenerateDebugInformation>
     252     </Link>
     253   </ItemDefinitionGroup>
     254   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     255@@ -632,14 +636,6 @@ bld_ml64.bat</Command>
     256     <ClCompile Include="..\..\..\gzread.c" />
     257     <ClCompile Include="..\..\..\gzwrite.c" />
     258     <ClCompile Include="..\..\..\infback.c" />
     259-    <ClCompile Include="..\..\masmx64\inffas8664.c">
     260-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
     261-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     262-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
     263-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
     264-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
     265-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     266-    </ClCompile>
     267     <ClCompile Include="..\..\..\inffast.c" />
     268     <ClCompile Include="..\..\..\inflate.c" />
     269     <ClCompile Include="..\..\..\inftrees.c" />
     270}}}
     271
     272== Release/x64 ==
     273
     274{{{
     275#!diff
     276--- "a/zlib\\contrib\\vstudio\\vc11\\zlibvc.vcxproj.orig"
     277+++ "b/zlib\\contrib\\vstudio\\vc11\\zlibvc.vcxproj"
     278@@ -1,5 +1,5 @@
     279 <?xml version="1.0" encoding="utf-8"?>
     280-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     281+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     282   <ItemGroup Label="ProjectConfigurations">
     283     <ProjectConfiguration Include="Debug|Itanium">
     284       <Configuration>Debug</Configuration>
     285@@ -46,50 +46,53 @@
     286     <ConfigurationType>DynamicLibrary</ConfigurationType>
     287     <UseOfMfc>false</UseOfMfc>
     288     <WholeProgramOptimization>true</WholeProgramOptimization>
     289-    <PlatformToolset>v110</PlatformToolset>
     290+    <PlatformToolset>v120</PlatformToolset>
     291   </PropertyGroup>
     292   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
     293     <ConfigurationType>DynamicLibrary</ConfigurationType>
     294     <UseOfMfc>false</UseOfMfc>
     295     <WholeProgramOptimization>true</WholeProgramOptimization>
     296-    <PlatformToolset>v110</PlatformToolset>
     297+    <PlatformToolset>v120</PlatformToolset>
     298   </PropertyGroup>
     299   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     300     <ConfigurationType>DynamicLibrary</ConfigurationType>
     301     <UseOfMfc>false</UseOfMfc>
     302-    <PlatformToolset>v110</PlatformToolset>
     303+    <PlatformToolset>v120</PlatformToolset>
     304     <CharacterSet>Unicode</CharacterSet>
     305   </PropertyGroup>
     306   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
     307     <ConfigurationType>DynamicLibrary</ConfigurationType>
     308     <UseOfMfc>false</UseOfMfc>
     309     <WholeProgramOptimization>true</WholeProgramOptimization>
     310+    <PlatformToolset>v120</PlatformToolset>
     311   </PropertyGroup>
     312   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
     313     <ConfigurationType>DynamicLibrary</ConfigurationType>
     314     <UseOfMfc>false</UseOfMfc>
     315     <WholeProgramOptimization>true</WholeProgramOptimization>
     316+    <PlatformToolset>v120</PlatformToolset>
     317   </PropertyGroup>
     318   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
     319     <ConfigurationType>DynamicLibrary</ConfigurationType>
     320     <UseOfMfc>false</UseOfMfc>
     321+    <PlatformToolset>v120</PlatformToolset>
     322   </PropertyGroup>
     323   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     324     <ConfigurationType>DynamicLibrary</ConfigurationType>
     325     <UseOfMfc>false</UseOfMfc>
     326     <WholeProgramOptimization>true</WholeProgramOptimization>
     327-    <PlatformToolset>v110</PlatformToolset>
     328+    <PlatformToolset>v120</PlatformToolset>
     329   </PropertyGroup>
     330   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
     331     <ConfigurationType>DynamicLibrary</ConfigurationType>
     332     <UseOfMfc>false</UseOfMfc>
     333     <WholeProgramOptimization>true</WholeProgramOptimization>
     334-    <PlatformToolset>v110</PlatformToolset>
     335+    <PlatformToolset>v120_xp</PlatformToolset>
     336   </PropertyGroup>
     337   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     338     <ConfigurationType>DynamicLibrary</ConfigurationType>
     339     <UseOfMfc>false</UseOfMfc>
     340-    <PlatformToolset>v110</PlatformToolset>
     341+    <PlatformToolset>v120</PlatformToolset>
     342   </PropertyGroup>
     343   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
     344   <ImportGroup Label="ExtensionSettings">
     345@@ -187,11 +190,11 @@
     346     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     347     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     348     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     349-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapi</TargetName>
     350-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>
     351+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlib1</TargetName>
     352+    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlib1</TargetName>
     353     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>
     354     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapi</TargetName>
     355-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>
     356+    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlib1</TargetName>
     357     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zlibwapi</TargetName>
     358   </PropertyGroup>
     359   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     360@@ -470,16 +473,17 @@ bld_ml64.bat</Command>
     361       <Culture>0x040c</Culture>
     362     </ResourceCompile>
     363     <Link>
     364-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
     365+      <OutputFile>$(OutDir)zlib1.dll</OutputFile>
     366       <SuppressStartupBanner>true</SuppressStartupBanner>
     367       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
     368       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
     369-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
     370+      <ProgramDatabaseFile>$(OutDir)zlib1.pdb</ProgramDatabaseFile>
     371       <GenerateMapFile>true</GenerateMapFile>
     372-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
     373+      <MapFileName>$(OutDir)zlib1.map</MapFileName>
     374       <SubSystem>Windows</SubSystem>
     375-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
     376+      <ImportLibrary>$(OutDir)zlib1.lib</ImportLibrary>
     377       <TargetMachine>MachineX64</TargetMachine>
     378+      <GenerateDebugInformation>true</GenerateDebugInformation>
     379     </Link>
     380   </ItemDefinitionGroup>
     381   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
     382}}}
     383
     384== Debug/x64 ==
     385
     386{{{
     387#!diff
     388--- "a/zlib\\contrib\\vstudio\\vc11\\zlibvc.vcxproj.orig"
     389+++ "b/zlib\\contrib\\vstudio\\vc11\\zlibvc.vcxproj"
     390@@ -1,5 +1,5 @@
     391 <?xml version="1.0" encoding="utf-8"?>
     392-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     393+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     394   <ItemGroup Label="ProjectConfigurations">
     395     <ProjectConfiguration Include="Debug|Itanium">
     396       <Configuration>Debug</Configuration>
     397@@ -46,50 +46,53 @@
     398     <ConfigurationType>DynamicLibrary</ConfigurationType>
     399     <UseOfMfc>false</UseOfMfc>
     400     <WholeProgramOptimization>true</WholeProgramOptimization>
     401-    <PlatformToolset>v110</PlatformToolset>
     402+    <PlatformToolset>v120</PlatformToolset>
     403   </PropertyGroup>
     404   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
     405     <ConfigurationType>DynamicLibrary</ConfigurationType>
     406     <UseOfMfc>false</UseOfMfc>
     407     <WholeProgramOptimization>true</WholeProgramOptimization>
     408-    <PlatformToolset>v110</PlatformToolset>
     409+    <PlatformToolset>v120</PlatformToolset>
     410   </PropertyGroup>
     411   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     412     <ConfigurationType>DynamicLibrary</ConfigurationType>
     413     <UseOfMfc>false</UseOfMfc>
     414-    <PlatformToolset>v110</PlatformToolset>
     415+    <PlatformToolset>v120</PlatformToolset>
     416     <CharacterSet>Unicode</CharacterSet>
     417   </PropertyGroup>
     418   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
     419     <ConfigurationType>DynamicLibrary</ConfigurationType>
     420     <UseOfMfc>false</UseOfMfc>
     421     <WholeProgramOptimization>true</WholeProgramOptimization>
     422+    <PlatformToolset>v120</PlatformToolset>
     423   </PropertyGroup>
     424   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
     425     <ConfigurationType>DynamicLibrary</ConfigurationType>
     426     <UseOfMfc>false</UseOfMfc>
     427     <WholeProgramOptimization>true</WholeProgramOptimization>
     428+    <PlatformToolset>v120</PlatformToolset>
     429   </PropertyGroup>
     430   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
     431     <ConfigurationType>DynamicLibrary</ConfigurationType>
     432     <UseOfMfc>false</UseOfMfc>
     433+    <PlatformToolset>v120</PlatformToolset>
     434   </PropertyGroup>
     435   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     436     <ConfigurationType>DynamicLibrary</ConfigurationType>
     437     <UseOfMfc>false</UseOfMfc>
     438     <WholeProgramOptimization>true</WholeProgramOptimization>
     439-    <PlatformToolset>v110</PlatformToolset>
     440+    <PlatformToolset>v120</PlatformToolset>
     441   </PropertyGroup>
     442   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
     443     <ConfigurationType>DynamicLibrary</ConfigurationType>
     444     <UseOfMfc>false</UseOfMfc>
     445     <WholeProgramOptimization>true</WholeProgramOptimization>
     446-    <PlatformToolset>v110</PlatformToolset>
     447+    <PlatformToolset>v120</PlatformToolset>
     448   </PropertyGroup>
     449   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     450     <ConfigurationType>DynamicLibrary</ConfigurationType>
     451     <UseOfMfc>false</UseOfMfc>
     452-    <PlatformToolset>v110</PlatformToolset>
     453+    <PlatformToolset>v120_xp</PlatformToolset>
     454   </PropertyGroup>
     455   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
     456   <ImportGroup Label="ExtensionSettings">
     457@@ -190,10 +193,13 @@
     458     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapi</TargetName>
     459     <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>
     460     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>
     461-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapi</TargetName>
     462+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlib1d</TargetName>
     463     <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>
     464     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zlibwapi</TargetName>
     465   </PropertyGroup>
     466+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     467+    <PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
     468+  </PropertyGroup>
     469   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     470     <Midl>
     471       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     472@@ -357,7 +363,7 @@ bld_ml32.bat</Command>
     473     <ClCompile>
     474       <Optimization>Disabled</Optimization>
     475       <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     476-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     477+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     478       <ExceptionHandling>
     479       </ExceptionHandling>
     480       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     481@@ -377,16 +383,16 @@ bld_ml32.bat</Command>
     482       <Culture>0x040c</Culture>
     483     </ResourceCompile>
     484     <Link>
     485-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
     486-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
     487+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
     488+      <OutputFile>$(OutDir)zlib1d.dll</OutputFile>
     489       <SuppressStartupBanner>true</SuppressStartupBanner>
     490       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
     491       <GenerateDebugInformation>true</GenerateDebugInformation>
     492-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
     493+      <ProgramDatabaseFile>$(OutDir)zlib1d.pdb</ProgramDatabaseFile>
     494       <GenerateMapFile>true</GenerateMapFile>
     495-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
     496+      <MapFileName>$(OutDir)zlib1d.map</MapFileName>
     497       <SubSystem>Windows</SubSystem>
     498-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
     499+      <ImportLibrary>$(OutDir)zlib1d.lib</ImportLibrary>
     500       <TargetMachine>MachineX64</TargetMachine>
     501     </Link>
     502     <PreBuildEvent>
     503}}}