[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=c34a26a

The following commit has been merged in the master branch:
commit c34a26a04bad379df90f2a3e9a2377ff0ad69362
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Dec 18 17:41:15 2010 +0000

    msvc64: explicity define IMPLIB for zlib (to prevent VS2010 from being confused).
---
 msvc64/zlib/zlib.vcproj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/msvc64/zlib/zlib.vcproj b/msvc64/zlib/zlib.vcproj
index 7f78893..68442db 100644
--- a/msvc64/zlib/zlib.vcproj
+++ b/msvc64/zlib/zlib.vcproj
@@ -71,6 +71,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions=""/IMPLIB:$(TargetDir)\zlib1.lib""
 				AdditionalDependencies=""
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -157,6 +158,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions=""/IMPLIB:$(TargetDir)\zlib1.lib""
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				ModuleDefinitionFile="..\..\..\zlib-1.2.3\win32\zlib.def"
@@ -381,6 +383,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions=""/IMPLIB:$(TargetDir)\zlib1d.lib""
 				AdditionalDependencies=""
 				OutputFile="$(OutDir)\$(ProjectName)d.dll"
 				LinkIncremental="2"
@@ -471,6 +474,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions=""/IMPLIB:$(TargetDir)\zlib1d.lib""
 				OutputFile="$(OutDir)\$(ProjectName)d.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"

-- 
exiv2 packaging