[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:42:08 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=6bb26ba
The following commit has been merged in the master branch:
commit 6bb26ba06b8df60e8eef39ef141243ee8f02c5b5
Author: Robin Mills <robin at clanmills.com>
Date: Sun Dec 12 18:10:59 2010 +0000
msvc64: adding /MACHINE:X64 linking to zlib {Debug|Release} for VS2010.
---
msvc64/zlib/zlib.vcproj | 215 +++++++++++++++++++++++++-----------------------
1 file changed, 110 insertions(+), 105 deletions(-)
diff --git a/msvc64/zlib/zlib.vcproj b/msvc64/zlib/zlib.vcproj
index 9231dbe..7f78893 100644
--- a/msvc64/zlib/zlib.vcproj
+++ b/msvc64/zlib/zlib.vcproj
@@ -5,7 +5,6 @@
Name="zlib1"
ProjectGUID="{8308C68D-E12B-4C71-96F4-7137F6BEB654}"
RootNamespace="zlib"
- TargetFrameworkVersion="0"
>
<Platforms>
<Platform
@@ -19,8 +18,8 @@
</ToolFiles>
<Configurations>
<Configuration
- Name="ReleaseDLL|Win32"
- OutputDirectory="$(PlatformName)/$(ConfigurationName)"
+ Name="ReleaseDLL|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="./build/$(PlatformName)/$(ConfigurationName)"
ConfigurationType="2"
UseOfMFC="0"
@@ -43,8 +42,8 @@
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName=".\Win32_DLL_Release/zlib.tlb"
+ TargetEnvironment="3"
+ TypeLibraryName="$(PlatformName)\$(ConfigurationName)/$(ProjectName).tlb"
HeaderFileName=""
/>
<Tool
@@ -72,12 +71,11 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies=""
LinkIncremental="1"
SuppressStartupBanner="true"
ModuleDefinitionFile="..\..\..\zlib-1.2.3\win32\zlib.def"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -99,14 +97,17 @@
Name="VCAppVerifierTool"
/>
<Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
- Name="Debug|Win32"
+ Name="ReleaseDLL|Win32"
OutputDirectory="$(PlatformName)/$(ConfigurationName)"
IntermediateDirectory="./build/$(PlatformName)/$(ConfigurationName)"
- ConfigurationType="4"
+ ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -124,40 +125,50 @@
/>
<Tool
Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName=".\Win32_DLL_Release/zlib.tlb"
+ HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="2"
+ InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BrowseInformation="1"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
WarningLevel="3"
SuppressStartupBanner="true"
- DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)\$(ProjectName)d.lib"
+ Name="VCLinkerTool"
+ LinkIncremental="1"
SuppressStartupBanner="true"
+ ModuleDefinitionFile="..\..\..\zlib-1.2.3\win32\zlib.def"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
+ Name="VCManifestTool"
+ />
+ <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -168,14 +179,20 @@
Name="VCFxCopTool"
/>
<Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
- Name="DebugDLL|Win32"
- OutputDirectory="$(PlatformName)/$(ConfigurationName)"
+ Name="Debug|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="./build/$(PlatformName)/$(ConfigurationName)"
- ConfigurationType="2"
+ ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -193,12 +210,7 @@
/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName=".\Win32_DLL_Debug/zlib.tlb"
- HeaderFileName=""
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
@@ -208,10 +220,9 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
- BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -225,23 +236,15 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\$(ProjectName)d.dll"
- LinkIncremental="2"
+ Name="VCLibrarianTool"
+ AdditionalOptions=" /MACHINE:X64"
+ OutputFile="$(OutDir)\$(ProjectName)d.lib"
SuppressStartupBanner="true"
- ModuleDefinitionFile="..\..\..\zlib-1.2.3\win32\zlib.def"
- GenerateDebugInformation="true"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -252,14 +255,11 @@
Name="VCFxCopTool"
/>
<Tool
- Name="VCAppVerifierTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
- Name="Release|Win32"
+ Name="Debug|Win32"
OutputDirectory="$(PlatformName)/$(ConfigurationName)"
IntermediateDirectory="./build/$(PlatformName)/$(ConfigurationName)"
ConfigurationType="4"
@@ -283,22 +283,23 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
+ Optimization="0"
AdditionalIncludeDirectories="../.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
+ DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
@@ -306,6 +307,7 @@
/>
<Tool
Name="VCLibrarianTool"
+ OutputFile="$(OutDir)\$(ProjectName)d.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -326,7 +328,7 @@
/>
</Configuration>
<Configuration
- Name="ReleaseDLL|x64"
+ Name="DebugDLL|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="./build/$(PlatformName)/$(ConfigurationName)"
ConfigurationType="2"
@@ -347,7 +349,7 @@
/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="3"
@@ -356,22 +358,22 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
+ Optimization="0"
AdditionalIncludeDirectories="../.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
WarningLevel="3"
SuppressStartupBanner="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
@@ -380,11 +382,12 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies=""
- LinkIncremental="1"
+ OutputFile="$(OutDir)\$(ProjectName)d.dll"
+ LinkIncremental="2"
SuppressStartupBanner="true"
ModuleDefinitionFile="..\..\..\zlib-1.2.3\win32\zlib.def"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/$(ProjectName).pdb"
TargetMachine="17"
/>
<Tool
@@ -407,14 +410,17 @@
Name="VCAppVerifierTool"
/>
<Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
- Name="Debug|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ Name="DebugDLL|Win32"
+ OutputDirectory="$(PlatformName)/$(ConfigurationName)"
IntermediateDirectory="./build/$(PlatformName)/$(ConfigurationName)"
- ConfigurationType="4"
+ ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -432,7 +438,12 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
+ PreprocessorDefinitions="_DEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName=".\Win32_DLL_Debug/zlib.tlb"
+ HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
@@ -442,9 +453,10 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
- DebugInformationFormat="3"
+ DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -458,14 +470,21 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)\$(ProjectName)d.lib"
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)\$(ProjectName)d.dll"
+ LinkIncremental="2"
SuppressStartupBanner="true"
+ ModuleDefinitionFile="..\..\..\zlib-1.2.3\win32\zlib.def"
+ GenerateDebugInformation="true"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
+ Name="VCManifestTool"
+ />
+ <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -476,14 +495,20 @@
Name="VCFxCopTool"
/>
<Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
- Name="DebugDLL|x64"
+ Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="./build/$(PlatformName)/$(ConfigurationName)"
- ConfigurationType="2"
+ ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -501,56 +526,40 @@
/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
TargetEnvironment="3"
- TypeLibraryName="$(PlatformName)\$(ConfigurationName)/$(ProjectName).tlb"
- HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="2"
+ InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
WarningLevel="3"
SuppressStartupBanner="true"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLinkerTool"
- AdditionalDependencies=""
- OutputFile="$(OutDir)\$(ProjectName)d.dll"
- LinkIncremental="2"
+ Name="VCLibrarianTool"
+ AdditionalOptions=" /MACHINE:X64"
SuppressStartupBanner="true"
- ModuleDefinitionFile="..\..\..\zlib-1.2.3\win32\zlib.def"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/$(ProjectName).pdb"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -561,15 +570,12 @@
Name="VCFxCopTool"
/>
<Tool
- Name="VCAppVerifierTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
- Name="Release|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ Name="Release|Win32"
+ OutputDirectory="$(PlatformName)/$(ConfigurationName)"
IntermediateDirectory="./build/$(PlatformName)/$(ConfigurationName)"
ConfigurationType="4"
UseOfMFC="0"
@@ -589,7 +595,6 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list