[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=586e516

The following commit has been merged in the master branch:
commit 586e5167ad4ba75cd015a6f4f02dafa1cf2c01c2
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Dec 12 17:03:38 2010 +0000

    msvc64: more build fixes.
---
 msvc64/ReadMe.txt               | 14 ++++++++------
 msvc64/exiv2lib/exiv2lib.vcproj |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/msvc64/ReadMe.txt b/msvc64/ReadMe.txt
index 3b68da2..bbf6dc4 100644
--- a/msvc64/ReadMe.txt
+++ b/msvc64/ReadMe.txt
@@ -6,16 +6,18 @@ Updated: 2010-12-12
 Work in progress.
 1) Working.
    Build 32 bit and 64bit builds of exiv2 (and libraries exiv2lib,expat,zlib,xmpsdk) in 32bit and 64bits.
+   Builds with VS2005, 2008 and 2010
 2) TODO:
+   Provide support for zlib1.2.5
+   Use .psprop files to hold "common" project settings for all projects
    Test Applications (exifprint etc)
-   Test build with VS2008 and VS2010
 
 Robin Mills
 http://clanmills.com
 email: robin at clanmills.com
 
 ####
-T A B L E  of  C O N T E N T S
+T A B L E  o f  C O N T E N T S
 
 1    Design
 1.1  Architecture
@@ -27,7 +29,7 @@ T A B L E  of  C O N T E N T S
 
 3    Build Instructions
 
-## end of table of contents ##
+## end Table of Contents ##
 ####
 
 
@@ -43,7 +45,7 @@ c:\gnu>dir
 c:\gnu>
 
 zlib and expat
-msvc64\zlib\zlib.{sln|vcproj}	   DevStudio Solution and Project files
+msvc64\zlib\zlib.{sln|vcproj}	       DevStudio Solution and Project files
 ..\..\..\zlib-1.2.3\                   Source code
 
 msvc64\expat\expat.sln expat.vcproj DevStudio Solution and Project files
@@ -52,7 +54,7 @@ msvc64\expat\expat.sln expat.vcproj DevStudio Solution and Project files
 1.1  Architecture
      There are directories for every component:
      The libraries: zlib, expat, xmpsdk, exiv2lib
-     Applications:  exiv2, exifprint etc......
+     Applications:  exiv2 (exifprint and other sample apps can be added on request)
      
      For each component, there are three build directories:
      exiv2libuild											intermediate results
@@ -63,7 +65,7 @@ msvc64\expat\expat.sln expat.vcproj DevStudio Solution and Project files
      The directory expat is a copy of expat, zlib is a copy of zlib
      
      As new versions of the libraries become available (eg zlib125) it will be added.
-     To build exiv2 with zlib125, the directory zlib125 should be copied to zlib.
+     Build instructions for zlib1.2.5 will be provided once zlib1.2.5 has been integrated.
 
 1.3  Relationship with msvc build environment
      This environment is similar to msvc (same build engineer).  However there are significant differences:
diff --git a/msvc64/exiv2lib/exiv2lib.vcproj b/msvc64/exiv2lib/exiv2lib.vcproj
index 2a49822..8fe1bfa 100644
--- a/msvc64/exiv2lib/exiv2lib.vcproj
+++ b/msvc64/exiv2lib/exiv2lib.vcproj
@@ -522,7 +522,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
-				AdditionalDependencies="..\xmpsdk\ReleaseDLL\xmpsdk.lib ..\..\..\expat-2.0.1\win32in
elease\libexpat.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Release\zlib1.lib"
+				AdditionalDependencies="..\xmpsdk\$(PlatformName)\$(ConfigurationName)\xmpsdk.lib ..\expat\$(PlatformName)\$(ConfigurationName)\libexpat.lib ..\zlib\$(PlatformName)\$(ConfigurationName)\zlib1.lib"
 				OutputFile="$(OutDir)\exiv2.dll"
 				GenerateDebugInformation="false"
 				ImportLibrary="$(TargetDir)\exiv2.lib"

-- 
exiv2 packaging