wiki:AdminDepLibsZlib

Version 1 (modified by romw, 9 years ago) (diff)

--

Changes to zLib Project Files

Release/x86

  • (a) "a/zlib\\contrib\\vstudio\\vc11\\zlibvc.vcxproj.orig" vs. (b) "b/zlib\\contrib\\vstudio\\vc11\\zlibvc.vcxproj"

    a b  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <ItemGroup Label="ProjectConfigurations">
    44    <ProjectConfiguration Include="Debug|Itanium">
    55      <Configuration>Debug</Configuration>
    … …  
    4646    <ConfigurationType>DynamicLibrary</ConfigurationType>
    4747    <UseOfMfc>false</UseOfMfc>
    4848    <WholeProgramOptimization>true</WholeProgramOptimization>
    49     <PlatformToolset>v110</PlatformToolset>
     49    <PlatformToolset>v120</PlatformToolset>
    5050  </PropertyGroup>
    5151  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
    5252    <ConfigurationType>DynamicLibrary</ConfigurationType>
    5353    <UseOfMfc>false</UseOfMfc>
    5454    <WholeProgramOptimization>true</WholeProgramOptimization>
    55     <PlatformToolset>v110</PlatformToolset>
     55    <PlatformToolset>v120_xp</PlatformToolset>
    5656  </PropertyGroup>
    5757  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    5858    <ConfigurationType>DynamicLibrary</ConfigurationType>
    5959    <UseOfMfc>false</UseOfMfc>
    60     <PlatformToolset>v110</PlatformToolset>
     60    <PlatformToolset>v120</PlatformToolset>
    6161    <CharacterSet>Unicode</CharacterSet>
    6262  </PropertyGroup>
    6363  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
    6464    <ConfigurationType>DynamicLibrary</ConfigurationType>
    6565    <UseOfMfc>false</UseOfMfc>
    6666    <WholeProgramOptimization>true</WholeProgramOptimization>
     67    <PlatformToolset>v120</PlatformToolset>
    6768  </PropertyGroup>
    6869  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
    6970    <ConfigurationType>DynamicLibrary</ConfigurationType>
    7071    <UseOfMfc>false</UseOfMfc>
    7172    <WholeProgramOptimization>true</WholeProgramOptimization>
     73    <PlatformToolset>v120</PlatformToolset>
    7274  </PropertyGroup>
    7375  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
    7476    <ConfigurationType>DynamicLibrary</ConfigurationType>
    7577    <UseOfMfc>false</UseOfMfc>
     78    <PlatformToolset>v120</PlatformToolset>
    7679  </PropertyGroup>
    7780  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    7881    <ConfigurationType>DynamicLibrary</ConfigurationType>
    7982    <UseOfMfc>false</UseOfMfc>
    8083    <WholeProgramOptimization>true</WholeProgramOptimization>
    81     <PlatformToolset>v110</PlatformToolset>
     84    <PlatformToolset>v120</PlatformToolset>
    8285  </PropertyGroup>
    8386  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
    8487    <ConfigurationType>DynamicLibrary</ConfigurationType>
    8588    <UseOfMfc>false</UseOfMfc>
    8689    <WholeProgramOptimization>true</WholeProgramOptimization>
    87     <PlatformToolset>v110</PlatformToolset>
     90    <PlatformToolset>v120</PlatformToolset>
    8891  </PropertyGroup>
    8992  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    9093    <ConfigurationType>DynamicLibrary</ConfigurationType>
    9194    <UseOfMfc>false</UseOfMfc>
    92     <PlatformToolset>v110</PlatformToolset>
     95    <PlatformToolset>v120_xp</PlatformToolset>
    9396  </PropertyGroup>
    9497  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    9598  <ImportGroup Label="ExtensionSettings">
    … …  
    188191    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
    189192    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
    190193    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapi</TargetName>
    191     <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>
     194    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlib1</TargetName>
    192195    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>
    193196    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapi</TargetName>
    194197    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>
    … … bld_ml32.bat</Command> 
    279282    </ResourceCompile>
    280283    <Link>
    281284      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
    282       <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
     285      <OutputFile>$(OutDir)zlib1.dll</OutputFile>
    283286      <SuppressStartupBanner>true</SuppressStartupBanner>
    284287      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
    285288      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
    286       <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
     289      <ProgramDatabaseFile>$(OutDir)zlib1.pdb</ProgramDatabaseFile>
    287290      <GenerateMapFile>true</GenerateMapFile>
    288       <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
     291      <MapFileName>$(OutDir)zlib1.map</MapFileName>
    289292      <SubSystem>Windows</SubSystem>
    290293      <RandomizedBaseAddress>false</RandomizedBaseAddress>
    291294      <DataExecutionPrevention>
    292295      </DataExecutionPrevention>
    293       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
     296      <ImportLibrary>$(OutDir)zlib1.lib</ImportLibrary>
     297      <GenerateDebugInformation>true</GenerateDebugInformation>
    294298    </Link>
    295299  </ItemDefinitionGroup>
    296300  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

Debug/x86

  • (a) "a/zlib\\contrib\\vstudio\\vc11\\zlibvc.vcxproj.orig" vs. (b) "b/zlib\\contrib\\vstudio\\vc11\\zlibvc.vcxproj"

    a b  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <ItemGroup Label="ProjectConfigurations">
    44    <ProjectConfiguration Include="Debug|Itanium">
    55      <Configuration>Debug</Configuration>
    … …  
    4646    <ConfigurationType>DynamicLibrary</ConfigurationType>
    4747    <UseOfMfc>false</UseOfMfc>
    4848    <WholeProgramOptimization>true</WholeProgramOptimization>
    49     <PlatformToolset>v110</PlatformToolset>
     49    <PlatformToolset>v120</PlatformToolset>
    5050  </PropertyGroup>
    5151  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
    5252    <ConfigurationType>DynamicLibrary</ConfigurationType>
    5353    <UseOfMfc>false</UseOfMfc>
    5454    <WholeProgramOptimization>true</WholeProgramOptimization>
    55     <PlatformToolset>v110</PlatformToolset>
     55    <PlatformToolset>v120</PlatformToolset>
    5656  </PropertyGroup>
    5757  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    5858    <ConfigurationType>DynamicLibrary</ConfigurationType>
    5959    <UseOfMfc>false</UseOfMfc>
    60     <PlatformToolset>v110</PlatformToolset>
     60    <PlatformToolset>v120</PlatformToolset>
    6161    <CharacterSet>Unicode</CharacterSet>
    6262  </PropertyGroup>
    6363  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
    6464    <ConfigurationType>DynamicLibrary</ConfigurationType>
    6565    <UseOfMfc>false</UseOfMfc>
    6666    <WholeProgramOptimization>true</WholeProgramOptimization>
     67    <PlatformToolset>v120</PlatformToolset>
    6768  </PropertyGroup>
    6869  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
    6970    <ConfigurationType>DynamicLibrary</ConfigurationType>
    7071    <UseOfMfc>false</UseOfMfc>
    7172    <WholeProgramOptimization>true</WholeProgramOptimization>
     73    <PlatformToolset>v120</PlatformToolset>
    7274  </PropertyGroup>
    7375  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
    7476    <ConfigurationType>DynamicLibrary</ConfigurationType>
    7577    <UseOfMfc>false</UseOfMfc>
     78    <PlatformToolset>v120</PlatformToolset>
    7679  </PropertyGroup>
    7780  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    7881    <ConfigurationType>DynamicLibrary</ConfigurationType>
    7982    <UseOfMfc>false</UseOfMfc>
    8083    <WholeProgramOptimization>true</WholeProgramOptimization>
    81     <PlatformToolset>v110</PlatformToolset>
     84    <PlatformToolset>v120</PlatformToolset>
    8285  </PropertyGroup>
    8386  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
    8487    <ConfigurationType>DynamicLibrary</ConfigurationType>
    8588    <UseOfMfc>false</UseOfMfc>
    8689    <WholeProgramOptimization>true</WholeProgramOptimization>
    87     <PlatformToolset>v110</PlatformToolset>
     90    <PlatformToolset>v120_xp</PlatformToolset>
    8891  </PropertyGroup>
    8992  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    9093    <ConfigurationType>DynamicLibrary</ConfigurationType>
    9194    <UseOfMfc>false</UseOfMfc>
    92     <PlatformToolset>v110</PlatformToolset>
     95    <PlatformToolset>v120</PlatformToolset>
    9396  </PropertyGroup>
    9497  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    9598  <ImportGroup Label="ExtensionSettings">
    … …  
    187190    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
    188191    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
    189192    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
    190     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapi</TargetName>
    191     <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>
     193    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlib1</TargetName>
     194    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlib1</TargetName>
    192195    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>
    193196    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapi</TargetName>
    194197    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>
    … …  
    204207    </Midl>
    205208    <ClCompile>
    206209      <Optimization>Disabled</Optimization>
    207       <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    208       <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     210      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     211      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    209212      <ExceptionHandling>
    210213      </ExceptionHandling>
    211214      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    … …  
    226229    </ResourceCompile>
    227230    <Link>
    228231      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
    229       <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
    230       <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
     232      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
     233      <OutputFile>$(OutDir)zlib1d.dll</OutputFile>
    231234      <SuppressStartupBanner>true</SuppressStartupBanner>
    232235      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
    233236      <GenerateDebugInformation>true</GenerateDebugInformation>
    234       <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
     237      <ProgramDatabaseFile>$(OutDir)zlib1d.pdb</ProgramDatabaseFile>
    235238      <GenerateMapFile>true</GenerateMapFile>
    236       <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
     239      <MapFileName>$(OutDir)zlib1d.map</MapFileName>
    237240      <SubSystem>Windows</SubSystem>
    238241      <RandomizedBaseAddress>false</RandomizedBaseAddress>
    239242      <DataExecutionPrevention>
    240243      </DataExecutionPrevention>
    241       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
     244      <ImportLibrary>$(OutDir)zlib1d.lib</ImportLibrary>
    242245    </Link>
    243246    <PreBuildEvent>
    244247      <Command>cd ..\..\masmx86
    … … bld_ml32.bat</Command> 
    279282    </ResourceCompile>
    280283    <Link>
    281284      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
    282       <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
     285      <OutputFile>$(OutDir)zlib1.dll</OutputFile>
    283286      <SuppressStartupBanner>true</SuppressStartupBanner>
    284287      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
    285288      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
    286       <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
     289      <ProgramDatabaseFile>$(OutDir)zlib1.pdb</ProgramDatabaseFile>
    287290      <GenerateMapFile>true</GenerateMapFile>
    288       <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
     291      <MapFileName>$(OutDir)zlib1.map</MapFileName>
    289292      <SubSystem>Windows</SubSystem>
    290293      <RandomizedBaseAddress>false</RandomizedBaseAddress>
    291294      <DataExecutionPrevention>
    292295      </DataExecutionPrevention>
    293       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
     296      <ImportLibrary>$(OutDir)zlib1.lib</ImportLibrary>
     297      <GenerateDebugInformation>true</GenerateDebugInformation>
    294298    </Link>
    295299  </ItemDefinitionGroup>
    296300  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    … … bld_ml64.bat</Command> 
    632636    <ClCompile Include="..\..\..\gzread.c" />
    633637    <ClCompile Include="..\..\..\gzwrite.c" />
    634638    <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>
    643639    <ClCompile Include="..\..\..\inffast.c" />
    644640    <ClCompile Include="..\..\..\inflate.c" />
    645641    <ClCompile Include="..\..\..\inftrees.c" />

Release/x64

  • (a) "a/zlib\\contrib\\vstudio\\vc11\\zlibvc.vcxproj.orig" vs. (b) "b/zlib\\contrib\\vstudio\\vc11\\zlibvc.vcxproj"

    a b  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <ItemGroup Label="ProjectConfigurations">
    44    <ProjectConfiguration Include="Debug|Itanium">
    55      <Configuration>Debug</Configuration>
    … …  
    4646    <ConfigurationType>DynamicLibrary</ConfigurationType>
    4747    <UseOfMfc>false</UseOfMfc>
    4848    <WholeProgramOptimization>true</WholeProgramOptimization>
    49     <PlatformToolset>v110</PlatformToolset>
     49    <PlatformToolset>v120</PlatformToolset>
    5050  </PropertyGroup>
    5151  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
    5252    <ConfigurationType>DynamicLibrary</ConfigurationType>
    5353    <UseOfMfc>false</UseOfMfc>
    5454    <WholeProgramOptimization>true</WholeProgramOptimization>
    55     <PlatformToolset>v110</PlatformToolset>
     55    <PlatformToolset>v120</PlatformToolset>
    5656  </PropertyGroup>
    5757  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    5858    <ConfigurationType>DynamicLibrary</ConfigurationType>
    5959    <UseOfMfc>false</UseOfMfc>
    60     <PlatformToolset>v110</PlatformToolset>
     60    <PlatformToolset>v120</PlatformToolset>
    6161    <CharacterSet>Unicode</CharacterSet>
    6262  </PropertyGroup>
    6363  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
    6464    <ConfigurationType>DynamicLibrary</ConfigurationType>
    6565    <UseOfMfc>false</UseOfMfc>
    6666    <WholeProgramOptimization>true</WholeProgramOptimization>
     67    <PlatformToolset>v120</PlatformToolset>
    6768  </PropertyGroup>
    6869  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
    6970    <ConfigurationType>DynamicLibrary</ConfigurationType>
    7071    <UseOfMfc>false</UseOfMfc>
    7172    <WholeProgramOptimization>true</WholeProgramOptimization>
     73    <PlatformToolset>v120</PlatformToolset>
    7274  </PropertyGroup>
    7375  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
    7476    <ConfigurationType>DynamicLibrary</ConfigurationType>
    7577    <UseOfMfc>false</UseOfMfc>
     78    <PlatformToolset>v120</PlatformToolset>
    7679  </PropertyGroup>
    7780  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    7881    <ConfigurationType>DynamicLibrary</ConfigurationType>
    7982    <UseOfMfc>false</UseOfMfc>
    8083    <WholeProgramOptimization>true</WholeProgramOptimization>
    81     <PlatformToolset>v110</PlatformToolset>
     84    <PlatformToolset>v120</PlatformToolset>
    8285  </PropertyGroup>
    8386  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
    8487    <ConfigurationType>DynamicLibrary</ConfigurationType>
    8588    <UseOfMfc>false</UseOfMfc>
    8689    <WholeProgramOptimization>true</WholeProgramOptimization>
    87     <PlatformToolset>v110</PlatformToolset>
     90    <PlatformToolset>v120_xp</PlatformToolset>
    8891  </PropertyGroup>
    8992  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    9093    <ConfigurationType>DynamicLibrary</ConfigurationType>
    9194    <UseOfMfc>false</UseOfMfc>
    92     <PlatformToolset>v110</PlatformToolset>
     95    <PlatformToolset>v120</PlatformToolset>
    9396  </PropertyGroup>
    9497  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    9598  <ImportGroup Label="ExtensionSettings">
    … …  
    187190    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
    188191    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
    189192    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
    190     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapi</TargetName>
    191     <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>
     193    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlib1</TargetName>
     194    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlib1</TargetName>
    192195    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>
    193196    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapi</TargetName>
    194     <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>
     197    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlib1</TargetName>
    195198    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zlibwapi</TargetName>
    196199  </PropertyGroup>
    197200  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    … … bld_ml64.bat</Command> 
    470473      <Culture>0x040c</Culture>
    471474    </ResourceCompile>
    472475    <Link>
    473       <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
     476      <OutputFile>$(OutDir)zlib1.dll</OutputFile>
    474477      <SuppressStartupBanner>true</SuppressStartupBanner>
    475478      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
    476479      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
    477       <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
     480      <ProgramDatabaseFile>$(OutDir)zlib1.pdb</ProgramDatabaseFile>
    478481      <GenerateMapFile>true</GenerateMapFile>
    479       <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
     482      <MapFileName>$(OutDir)zlib1.map</MapFileName>
    480483      <SubSystem>Windows</SubSystem>
    481       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
     484      <ImportLibrary>$(OutDir)zlib1.lib</ImportLibrary>
    482485      <TargetMachine>MachineX64</TargetMachine>
     486      <GenerateDebugInformation>true</GenerateDebugInformation>
    483487    </Link>
    484488  </ItemDefinitionGroup>
    485489  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">

Debug/x64

  • (a) "a/zlib\\contrib\\vstudio\\vc11\\zlibvc.vcxproj.orig" vs. (b) "b/zlib\\contrib\\vstudio\\vc11\\zlibvc.vcxproj"

    a b  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <ItemGroup Label="ProjectConfigurations">
    44    <ProjectConfiguration Include="Debug|Itanium">
    55      <Configuration>Debug</Configuration>
    … …  
    4646    <ConfigurationType>DynamicLibrary</ConfigurationType>
    4747    <UseOfMfc>false</UseOfMfc>
    4848    <WholeProgramOptimization>true</WholeProgramOptimization>
    49     <PlatformToolset>v110</PlatformToolset>
     49    <PlatformToolset>v120</PlatformToolset>
    5050  </PropertyGroup>
    5151  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
    5252    <ConfigurationType>DynamicLibrary</ConfigurationType>
    5353    <UseOfMfc>false</UseOfMfc>
    5454    <WholeProgramOptimization>true</WholeProgramOptimization>
    55     <PlatformToolset>v110</PlatformToolset>
     55    <PlatformToolset>v120</PlatformToolset>
    5656  </PropertyGroup>
    5757  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    5858    <ConfigurationType>DynamicLibrary</ConfigurationType>
    5959    <UseOfMfc>false</UseOfMfc>
    60     <PlatformToolset>v110</PlatformToolset>
     60    <PlatformToolset>v120</PlatformToolset>
    6161    <CharacterSet>Unicode</CharacterSet>
    6262  </PropertyGroup>
    6363  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
    6464    <ConfigurationType>DynamicLibrary</ConfigurationType>
    6565    <UseOfMfc>false</UseOfMfc>
    6666    <WholeProgramOptimization>true</WholeProgramOptimization>
     67    <PlatformToolset>v120</PlatformToolset>
    6768  </PropertyGroup>
    6869  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
    6970    <ConfigurationType>DynamicLibrary</ConfigurationType>
    7071    <UseOfMfc>false</UseOfMfc>
    7172    <WholeProgramOptimization>true</WholeProgramOptimization>
     73    <PlatformToolset>v120</PlatformToolset>
    7274  </PropertyGroup>
    7375  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
    7476    <ConfigurationType>DynamicLibrary</ConfigurationType>
    7577    <UseOfMfc>false</UseOfMfc>
     78    <PlatformToolset>v120</PlatformToolset>
    7679  </PropertyGroup>
    7780  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    7881    <ConfigurationType>DynamicLibrary</ConfigurationType>
    7982    <UseOfMfc>false</UseOfMfc>
    8083    <WholeProgramOptimization>true</WholeProgramOptimization>
    81     <PlatformToolset>v110</PlatformToolset>
     84    <PlatformToolset>v120</PlatformToolset>
    8285  </PropertyGroup>
    8386  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
    8487    <ConfigurationType>DynamicLibrary</ConfigurationType>
    8588    <UseOfMfc>false</UseOfMfc>
    8689    <WholeProgramOptimization>true</WholeProgramOptimization>
    87     <PlatformToolset>v110</PlatformToolset>
     90    <PlatformToolset>v120</PlatformToolset>
    8891  </PropertyGroup>
    8992  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    9093    <ConfigurationType>DynamicLibrary</ConfigurationType>
    9194    <UseOfMfc>false</UseOfMfc>
    92     <PlatformToolset>v110</PlatformToolset>
     95    <PlatformToolset>v120_xp</PlatformToolset>
    9396  </PropertyGroup>
    9497  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    9598  <ImportGroup Label="ExtensionSettings">
    … …  
    190193    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapi</TargetName>
    191194    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>
    192195    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>
    193     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapi</TargetName>
     196    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlib1d</TargetName>
    194197    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>
    195198    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zlibwapi</TargetName>
    196199  </PropertyGroup>
     200  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     201    <PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
     202  </PropertyGroup>
    197203  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    198204    <Midl>
    199205      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    … … bld_ml32.bat</Command> 
    357363    <ClCompile>
    358364      <Optimization>Disabled</Optimization>
    359365      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    360       <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     366      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    361367      <ExceptionHandling>
    362368      </ExceptionHandling>
    363369      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    … … bld_ml32.bat</Command> 
    377383      <Culture>0x040c</Culture>
    378384    </ResourceCompile>
    379385    <Link>
    380       <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
    381       <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
     386      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
     387      <OutputFile>$(OutDir)zlib1d.dll</OutputFile>
    382388      <SuppressStartupBanner>true</SuppressStartupBanner>
    383389      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
    384390      <GenerateDebugInformation>true</GenerateDebugInformation>
    385       <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
     391      <ProgramDatabaseFile>$(OutDir)zlib1d.pdb</ProgramDatabaseFile>
    386392      <GenerateMapFile>true</GenerateMapFile>
    387       <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
     393      <MapFileName>$(OutDir)zlib1d.map</MapFileName>
    388394      <SubSystem>Windows</SubSystem>
    389       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
     395      <ImportLibrary>$(OutDir)zlib1d.lib</ImportLibrary>
    390396      <TargetMachine>MachineX64</TargetMachine>
    391397    </Link>
    392398    <PreBuildEvent>