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

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:39:03 UTC 2017


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

The following commit has been merged in the master branch:
commit d1f41794fcd93e48291ea44a18856baad6a86b3f
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Nov 13 13:44:12 2007 +0000

    Fixed MSVC compilation of the samples.
---
 msvc/addmoddel/addmoddel.vcproj           |  4 +-
 msvc/crwparse/crwparse.vcproj             |  2 +
 msvc/exifcomment/exifcomment.vcproj       |  4 +-
 msvc/exifdata-test/exifdata-test.vcproj   |  2 +
 msvc/exifprint/exifprint.vcproj           |  4 +-
 msvc/exiv2com/exif.cpp                    | 29 +++++-------
 msvc/exiv2com/exiv2com.vcproj             |  4 +-
 msvc/exiv2lib/exiv2lib.vcproj             | 74 ++++++++++++++++---------------
 msvc/exivsimple/exivsimple.cpp            |  6 +--
 msvc/exivsimple/exivsimple.vcproj         |  4 +-
 msvc/ifd-test/ifd-test.vcproj             |  4 +-
 msvc/iotest/iotest.vcproj                 |  4 +-
 msvc/iptceasy/iptceasy.vcproj             |  4 +-
 msvc/iptcprint/iptcprint.vcproj           |  4 +-
 msvc/iptctest/iptctest.vcproj             |  4 +-
 msvc/largeiptc-test/largeiptc-test.vcproj |  4 +-
 msvc/makernote-test/makernote-test.vcproj |  4 +-
 msvc/write-test/write-test.vcproj         |  4 +-
 msvc/write2-test/write2-test.vcproj       |  4 +-
 19 files changed, 86 insertions(+), 83 deletions(-)

diff --git a/msvc/addmoddel/addmoddel.vcproj b/msvc/addmoddel/addmoddel.vcproj
index a1f22d1..0d77986 100644
--- a/msvc/addmoddel/addmoddel.vcproj
+++ b/msvc/addmoddel/addmoddel.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -72,7 +72,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="4"
 				RuntimeTypeInfo="TRUE"
diff --git a/msvc/crwparse/crwparse.vcproj b/msvc/crwparse/crwparse.vcproj
index 07646e7..15dc89b 100644
--- a/msvc/crwparse/crwparse.vcproj
+++ b/msvc/crwparse/crwparse.vcproj
@@ -19,6 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -67,6 +68,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="4"
 				UsePrecompiledHeader="0"
diff --git a/msvc/exifcomment/exifcomment.vcproj b/msvc/exifcomment/exifcomment.vcproj
index 5a6750c..eeac1c7 100644
--- a/msvc/exifcomment/exifcomment.vcproj
+++ b/msvc/exifcomment/exifcomment.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -72,7 +72,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="4"
 				RuntimeTypeInfo="TRUE"
diff --git a/msvc/exifdata-test/exifdata-test.vcproj b/msvc/exifdata-test/exifdata-test.vcproj
index 2be5a73..e2a0ba8 100644
--- a/msvc/exifdata-test/exifdata-test.vcproj
+++ b/msvc/exifdata-test/exifdata-test.vcproj
@@ -19,6 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -67,6 +68,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="4"
 				UsePrecompiledHeader="0"
diff --git a/msvc/exifprint/exifprint.vcproj b/msvc/exifprint/exifprint.vcproj
index 78b573a..9e4e81c 100644
--- a/msvc/exifprint/exifprint.vcproj
+++ b/msvc/exifprint/exifprint.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -72,7 +72,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="4"
 				RuntimeTypeInfo="TRUE"
diff --git a/msvc/exiv2com/exif.cpp b/msvc/exiv2com/exif.cpp
index 800d2dc..c5fab10 100644
--- a/msvc/exiv2com/exif.cpp
+++ b/msvc/exiv2com/exif.cpp
@@ -5,24 +5,19 @@
 
 // *****************************************************************************
 // included header files
-#ifdef _MSC_VER
-# include "exv_msvc.h"
-#else
-# include "exv_conf.h"
-#endif
-
-#include "actions.hpp"
-#include "image.hpp"
-#include "jpgimage.hpp"
-#include "exiv2.hpp"
-#include "utils.hpp"
-#include "types.hpp"
-#include "exif.hpp"
-#include "canonmn.hpp"
-#include "iptc.hpp"
-#include "futils.hpp"
+#include <exiv2/exv_msvc.h>
+#include <exiv2/actions.hpp>
+#include <exiv2/image.hpp>
+#include <exiv2/jpgimage.hpp>
+#include <exiv2/exiv2.hpp>
+#include <exiv2/utils.hpp>
+#include <exiv2/types.hpp>
+#include <exiv2/exif.hpp>
+#include <exiv2/canonmn.hpp>
+#include <exiv2/iptc.hpp>
+#include <exiv2/futils.hpp>
 #ifndef EXV_HAVE_TIMEGM
-# include "timegm.h"
+# include <exiv2/timegm.h>
 #endif
 
 // + standard includes
diff --git a/msvc/exiv2com/exiv2com.vcproj b/msvc/exiv2com/exiv2com.vcproj
index b1b77e4..b406c85 100644
--- a/msvc/exiv2com/exiv2com.vcproj
+++ b/msvc/exiv2com/exiv2com.vcproj
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -92,7 +92,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL"
 				MinimalRebuild="FALSE"
 				RuntimeLibrary="4"
diff --git a/msvc/exiv2lib/exiv2lib.vcproj b/msvc/exiv2lib/exiv2lib.vcproj
index 849f170..1fdbc83 100644
--- a/msvc/exiv2lib/exiv2lib.vcproj
+++ b/msvc/exiv2lib/exiv2lib.vcproj
@@ -4,6 +4,7 @@
 	Version="7.10"
 	Name="exiv2lib"
 	ProjectGUID="{831EF580-92C8-4CA8-B0CE-3D906280A54D}"
+	RootNamespace="exiv2lib"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -40,7 +41,10 @@
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPostBuildEventTool"
+				CommandLine="xcopy /y /i ..\..\src\*.h ..\include\exiv2\
+xcopy /y /i ..\..\src\*.hpp ..\include\exiv2\
+"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
@@ -272,6 +276,21 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\..\src\makernote2.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="..\..\src\metadatum.cpp">
 			</File>
 			<File
@@ -299,6 +318,9 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\..\src\orfimage.cpp">
+			</File>
+			<File
 				RelativePath="..\..\src\panasonicmn.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
@@ -317,6 +339,9 @@
 				RelativePath="..\..\src\pentaxmn.cpp">
 			</File>
 			<File
+				RelativePath="..\..\src\properties.cpp">
+			</File>
+			<File
 				RelativePath="..\..\src
afimage.cpp">
 			</File>
 			<File
@@ -365,7 +390,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src	iffimage.cpp">
+				RelativePath="..\..\src	iffcomposite.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -380,10 +405,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\orfimage.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src	iffparser.cpp">
+				RelativePath="..\..\src	iffimage.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -398,7 +420,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src	iffcomposite.cpp">
+				RelativePath="..\..\src	iffparser.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -428,24 +450,6 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\makernote2.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\properties.cpp">
-			</File>
-			<File
 				RelativePath="..\..\src	ypes.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
@@ -529,15 +533,18 @@
 				RelativePath="..\..\src\makernote.hpp">
 			</File>
 			<File
-				RelativePath="..\..\src\metadatum.hpp">
+				RelativePath="..\..\src\makernote2.hpp">
 			</File>
 			<File
-				RelativePath="..\..\src\mn.hpp">
+				RelativePath="..\..\src\metadatum.hpp">
 			</File>
 			<File
 				RelativePath="..\..\src\minoltamn.hpp">
 			</File>
 			<File
+				RelativePath="..\..\src\mn.hpp">
+			</File>
+			<File
 				RelativePath="..\..\src\mrwimage.hpp">
 			</File>
 			<File
@@ -547,6 +554,9 @@
 				RelativePath="..\..\src\olympusmn.hpp">
 			</File>
 			<File
+				RelativePath="..\..\src\orfimage.hpp">
+			</File>
+			<File
 				RelativePath="..\..\src\panasonicmn.hpp">
 			</File>
 			<File
@@ -571,24 +581,18 @@
 				RelativePath="..\..\src	ags.hpp">
 			</File>
 			<File
-				RelativePath="..\..\src	iffimage.hpp">
+				RelativePath="..\..\src	iffcomposite.hpp">
 			</File>
 			<File
-				RelativePath="..\..\src\orfimage.hpp">
+				RelativePath="..\..\src	iffimage.hpp">
 			</File>
 			<File
 				RelativePath="..\..\src	iffparser.hpp">
 			</File>
 			<File
-				RelativePath="..\..\src	iffcomposite.hpp">
-			</File>
-			<File
 				RelativePath="..\..\src	iffvisitor.hpp">
 			</File>
 			<File
-				RelativePath="..\..\src\makernote2.hpp">
-			</File>
-			<File
 				RelativePath="..\..\src	ypes.hpp">
 			</File>
 			<File
diff --git a/msvc/exivsimple/exivsimple.cpp b/msvc/exivsimple/exivsimple.cpp
index 1fb7549..b6b9092 100644
--- a/msvc/exivsimple/exivsimple.cpp
+++ b/msvc/exivsimple/exivsimple.cpp
@@ -29,9 +29,9 @@
 
 #include "stdafx.h"
 #include "exivsimple.h"
-#include "image.hpp"
-#include "exif.hpp"
-#include "iptc.hpp"
+#include <exiv2/image.hpp>
+#include <exiv2/exif.hpp>
+#include <exiv2/iptc.hpp>
 #include <cassert>
 #include <cstring>
 
diff --git a/msvc/exivsimple/exivsimple.vcproj b/msvc/exivsimple/exivsimple.vcproj
index 22a8252..030ef7f 100644
--- a/msvc/exivsimple/exivsimple.vcproj
+++ b/msvc/exivsimple/exivsimple.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EXIVSIMPLE_EXPORTS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -76,7 +76,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				GlobalOptimizations="TRUE"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EXIVSIMPLE_EXPORTS"
 				StringPooling="TRUE"
 				RuntimeLibrary="4"
diff --git a/msvc/ifd-test/ifd-test.vcproj b/msvc/ifd-test/ifd-test.vcproj
index bdea77d..7d47c9b 100644
--- a/msvc/ifd-test/ifd-test.vcproj
+++ b/msvc/ifd-test/ifd-test.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -71,7 +71,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="4"
 				RuntimeTypeInfo="TRUE"
diff --git a/msvc/iotest/iotest.vcproj b/msvc/iotest/iotest.vcproj
index 61cb4f0..1161a97 100644
--- a/msvc/iotest/iotest.vcproj
+++ b/msvc/iotest/iotest.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -71,7 +71,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="4"
 				RuntimeTypeInfo="TRUE"
diff --git a/msvc/iptceasy/iptceasy.vcproj b/msvc/iptceasy/iptceasy.vcproj
index b5e3da0..f471a48 100644
--- a/msvc/iptceasy/iptceasy.vcproj
+++ b/msvc/iptceasy/iptceasy.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -71,7 +71,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="4"
 				RuntimeTypeInfo="TRUE"
diff --git a/msvc/iptcprint/iptcprint.vcproj b/msvc/iptcprint/iptcprint.vcproj
index 66d5ead..002ea99 100644
--- a/msvc/iptcprint/iptcprint.vcproj
+++ b/msvc/iptcprint/iptcprint.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -71,7 +71,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="4"
 				RuntimeTypeInfo="TRUE"
diff --git a/msvc/iptctest/iptctest.vcproj b/msvc/iptctest/iptctest.vcproj
index d08b333..63ba530 100644
--- a/msvc/iptctest/iptctest.vcproj
+++ b/msvc/iptctest/iptctest.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -71,7 +71,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="4"
 				BufferSecurityCheck="TRUE"
diff --git a/msvc/largeiptc-test/largeiptc-test.vcproj b/msvc/largeiptc-test/largeiptc-test.vcproj
index 0828ce0..4b24777 100644
--- a/msvc/largeiptc-test/largeiptc-test.vcproj
+++ b/msvc/largeiptc-test/largeiptc-test.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -71,7 +71,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="4"
 				RuntimeTypeInfo="TRUE"
diff --git a/msvc/makernote-test/makernote-test.vcproj b/msvc/makernote-test/makernote-test.vcproj
index 6ac80f1..f3f6b56 100644
--- a/msvc/makernote-test/makernote-test.vcproj
+++ b/msvc/makernote-test/makernote-test.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -71,7 +71,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="4"
 				RuntimeTypeInfo="TRUE"
diff --git a/msvc/write-test/write-test.vcproj b/msvc/write-test/write-test.vcproj
index 68bf344..cf84092 100644
--- a/msvc/write-test/write-test.vcproj
+++ b/msvc/write-test/write-test.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -72,7 +72,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="4"
 				RuntimeTypeInfo="TRUE"
diff --git a/msvc/write2-test/write2-test.vcproj b/msvc/write2-test/write2-test.vcproj
index 2109a2f..6b63121 100644
--- a/msvc/write2-test/write2-test.vcproj
+++ b/msvc/write2-test/write2-test.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -72,7 +72,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""..\..\src";"..\..""
+				AdditionalIncludeDirectories=""..\include";"..\..""
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="4"
 				RuntimeTypeInfo="TRUE"

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list