msvc64: adding /MACHINE:X64 linking to zlib {Debug|Release} for VS2010.

v0.27.3
Robin Mills 15 years ago
parent 7df6dd6b80
commit 6bb26ba06b

@ -5,7 +5,6 @@
Name="zlib1" Name="zlib1"
ProjectGUID="{8308C68D-E12B-4C71-96F4-7137F6BEB654}" ProjectGUID="{8308C68D-E12B-4C71-96F4-7137F6BEB654}"
RootNamespace="zlib" RootNamespace="zlib"
TargetFrameworkVersion="0"
> >
<Platforms> <Platforms>
<Platform <Platform
@ -19,8 +18,8 @@
</ToolFiles> </ToolFiles>
<Configurations> <Configurations>
<Configuration <Configuration
Name="ReleaseDLL|Win32" Name="ReleaseDLL|x64"
OutputDirectory="$(PlatformName)/$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="./build/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="./build/$(PlatformName)/$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
UseOfMFC="0" UseOfMFC="0"
@ -43,8 +42,8 @@
PreprocessorDefinitions="NDEBUG" PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true" MkTypLibCompatible="true"
SuppressStartupBanner="true" SuppressStartupBanner="true"
TargetEnvironment="1" TargetEnvironment="3"
TypeLibraryName=".\Win32_DLL_Release/zlib.tlb" TypeLibraryName="$(PlatformName)\$(ConfigurationName)/$(ProjectName).tlb"
HeaderFileName="" HeaderFileName=""
/> />
<Tool <Tool
@ -72,12 +71,11 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies=""
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
ModuleDefinitionFile="..\..\..\zlib-1.2.3\win32\zlib.def" ModuleDefinitionFile="..\..\..\zlib-1.2.3\win32\zlib.def"
RandomizedBaseAddress="1" TargetMachine="17"
DataExecutionPrevention="0"
TargetMachine="1"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -98,15 +96,18 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|Win32" Name="ReleaseDLL|Win32"
OutputDirectory="$(PlatformName)/$(ConfigurationName)" OutputDirectory="$(PlatformName)/$(ConfigurationName)"
IntermediateDirectory="./build/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="./build/$(PlatformName)/$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="2"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false" ATLMinimizesCRunTimeLibraryUsage="false"
> >
@ -124,39 +125,49 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
TypeLibraryName=".\Win32_DLL_Release/zlib.tlb"
HeaderFileName=""
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../.." AdditionalIncludeDirectories="../.."
PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS" PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true" StringPooling="true"
BasicRuntimeChecks="3" RuntimeLibrary="2"
RuntimeLibrary="3" EnableFunctionLevelLinking="true"
BrowseInformation="1"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="true" SuppressStartupBanner="true"
DebugInformationFormat="4"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
/> />
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG" PreprocessorDefinitions="NDEBUG"
Culture="1033" Culture="1033"
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)d.lib" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
ModuleDefinitionFile="..\..\..\zlib-1.2.3\win32\zlib.def"
TargetMachine="1"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
/> />
<Tool
Name="VCManifestTool"
/>
<Tool <Tool
Name="VCXDCMakeTool" Name="VCXDCMakeTool"
/> />
@ -167,15 +178,21 @@
<Tool <Tool
Name="VCFxCopTool" Name="VCFxCopTool"
/> />
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="DebugDLL|Win32" Name="Debug|x64"
OutputDirectory="$(PlatformName)/$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="./build/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="./build/$(PlatformName)/$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="4"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false" ATLMinimizesCRunTimeLibraryUsage="false"
> >
@ -193,12 +210,7 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
PreprocessorDefinitions="_DEBUG" TargetEnvironment="3"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
TypeLibraryName=".\Win32_DLL_Debug/zlib.tlb"
HeaderFileName=""
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
@ -208,10 +220,9 @@
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
BrowseInformation="1"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="true" SuppressStartupBanner="true"
DebugInformationFormat="4" DebugInformationFormat="3"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
@ -225,22 +236,14 @@
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLibrarianTool"
OutputFile="$(OutDir)\$(ProjectName)d.dll" AdditionalOptions=" /MACHINE:X64"
LinkIncremental="2" OutputFile="$(OutDir)\$(ProjectName)d.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
ModuleDefinitionFile="..\..\..\zlib-1.2.3\win32\zlib.def"
GenerateDebugInformation="true"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
/> />
<Tool
Name="VCManifestTool"
/>
<Tool <Tool
Name="VCXDCMakeTool" Name="VCXDCMakeTool"
/> />
@ -251,15 +254,12 @@
<Tool <Tool
Name="VCFxCopTool" Name="VCFxCopTool"
/> />
<Tool
Name="VCAppVerifierTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Debug|Win32"
OutputDirectory="$(PlatformName)/$(ConfigurationName)" OutputDirectory="$(PlatformName)/$(ConfigurationName)"
IntermediateDirectory="./build/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="./build/$(PlatformName)/$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
@ -283,22 +283,23 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="0"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../.." AdditionalIncludeDirectories="../.."
PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS" PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS"
StringPooling="true" MinimalRebuild="true"
RuntimeLibrary="2" BasicRuntimeChecks="3"
EnableFunctionLevelLinking="true" RuntimeLibrary="3"
BrowseInformation="1"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="true" SuppressStartupBanner="true"
DebugInformationFormat="4"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
/> />
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG" PreprocessorDefinitions="_DEBUG"
Culture="1033" Culture="1033"
/> />
<Tool <Tool
@ -306,6 +307,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="$(OutDir)\$(ProjectName)d.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -326,7 +328,7 @@
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="ReleaseDLL|x64" Name="DebugDLL|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="./build/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="./build/$(PlatformName)/$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
@ -347,7 +349,7 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG" PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="true" MkTypLibCompatible="true"
SuppressStartupBanner="true" SuppressStartupBanner="true"
TargetEnvironment="3" TargetEnvironment="3"
@ -356,22 +358,22 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="0"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../.." AdditionalIncludeDirectories="../.."
PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS" PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS"
StringPooling="true" MinimalRebuild="true"
RuntimeLibrary="2" BasicRuntimeChecks="3"
EnableFunctionLevelLinking="true" RuntimeLibrary="3"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="true" SuppressStartupBanner="true"
DebugInformationFormat="3"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
/> />
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG" PreprocessorDefinitions="_DEBUG"
Culture="1033" Culture="1033"
/> />
<Tool <Tool
@ -380,11 +382,12 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="" AdditionalDependencies=""
LinkIncremental="1" OutputFile="$(OutDir)\$(ProjectName)d.dll"
LinkIncremental="2"
SuppressStartupBanner="true" SuppressStartupBanner="true"
ModuleDefinitionFile="..\..\..\zlib-1.2.3\win32\zlib.def" ModuleDefinitionFile="..\..\..\zlib-1.2.3\win32\zlib.def"
RandomizedBaseAddress="1" GenerateDebugInformation="true"
DataExecutionPrevention="0" ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/$(ProjectName).pdb"
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool
@ -406,15 +409,18 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="DebugDLL|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(PlatformName)/$(ConfigurationName)"
IntermediateDirectory="./build/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="./build/$(PlatformName)/$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="2"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false" ATLMinimizesCRunTimeLibraryUsage="false"
> >
@ -432,7 +438,12 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TargetEnvironment="3" PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
TypeLibraryName=".\Win32_DLL_Debug/zlib.tlb"
HeaderFileName=""
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
@ -442,9 +453,10 @@
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
BrowseInformation="1"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="true" SuppressStartupBanner="true"
DebugInformationFormat="3" DebugInformationFormat="4"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
@ -458,13 +470,20 @@
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)d.lib" OutputFile="$(OutDir)\$(ProjectName)d.dll"
LinkIncremental="2"
SuppressStartupBanner="true" SuppressStartupBanner="true"
ModuleDefinitionFile="..\..\..\zlib-1.2.3\win32\zlib.def"
GenerateDebugInformation="true"
TargetMachine="1"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
/> />
<Tool
Name="VCManifestTool"
/>
<Tool <Tool
Name="VCXDCMakeTool" Name="VCXDCMakeTool"
/> />
@ -475,15 +494,21 @@
<Tool <Tool
Name="VCFxCopTool" Name="VCFxCopTool"
/> />
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="DebugDLL|x64" Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="./build/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="./build/$(PlatformName)/$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="4"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false" ATLMinimizesCRunTimeLibraryUsage="false"
> >
@ -501,55 +526,39 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="3" TargetEnvironment="3"
TypeLibraryName="$(PlatformName)\$(ConfigurationName)/$(ProjectName).tlb"
HeaderFileName=""
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../.." AdditionalIncludeDirectories="../.."
PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS" PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true" StringPooling="true"
BasicRuntimeChecks="3" RuntimeLibrary="2"
RuntimeLibrary="3" EnableFunctionLevelLinking="true"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="true" SuppressStartupBanner="true"
DebugInformationFormat="3"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
/> />
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG" PreprocessorDefinitions="NDEBUG"
Culture="1033" Culture="1033"
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLibrarianTool"
AdditionalDependencies="" AdditionalOptions=" /MACHINE:X64"
OutputFile="$(OutDir)\$(ProjectName)d.dll"
LinkIncremental="2"
SuppressStartupBanner="true" SuppressStartupBanner="true"
ModuleDefinitionFile="..\..\..\zlib-1.2.3\win32\zlib.def"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/$(ProjectName).pdb"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="17"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
/> />
<Tool
Name="VCManifestTool"
/>
<Tool <Tool
Name="VCXDCMakeTool" Name="VCXDCMakeTool"
/> />
@ -560,16 +569,13 @@
<Tool <Tool
Name="VCFxCopTool" Name="VCFxCopTool"
/> />
<Tool
Name="VCAppVerifierTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(PlatformName)/$(ConfigurationName)"
IntermediateDirectory="./build/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="./build/$(PlatformName)/$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
UseOfMFC="0" UseOfMFC="0"
@ -589,7 +595,6 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TargetEnvironment="3"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"

Loading…
Cancel
Save