Fix for http://dev.exiv2.org/issues/1213

Two changes: add $(ProjectDir)../../src to the include path
change $(SolutionDir)../ to $(ProjectDir)../../ in order so that individual projects may be used in solutions other than those in the exiv2 tree. The existing terminology ties the include paths to the Solution and the new methodology ties them to the Project and enables them to "float" to any Solution.

msvc2005/addmoddel/addmoddel.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/conntest/conntest.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;LIBSSH_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -127,7 +127,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;LIBSSH_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -208,7 +208,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;LIBSSH_STATIC"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -288,7 +288,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;LIBSSH_STATIC"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -368,7 +368,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -450,7 +450,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -530,7 +530,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -612,7 +612,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/convert-test/convert-test.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/easyaccess-test/easyaccess-test.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/exifcomment/exifcomment.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/exifdata-test/exifdata-test.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/exifdata/exifdata.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/exifprint/exifprint.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -127,7 +127,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -208,7 +208,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -288,7 +288,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -368,7 +368,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -450,7 +450,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -530,7 +530,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -612,7 +612,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/exifvalue/exifvalue.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/exiv2json/exiv2json.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -127,7 +127,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -208,7 +208,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -289,7 +289,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -370,7 +370,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -453,7 +453,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -534,7 +534,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -617,7 +617,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/geotag/geotag.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/httptest/httptest.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -127,7 +127,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -208,7 +208,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -290,7 +290,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -371,7 +371,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -454,7 +454,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -535,7 +535,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -618,7 +618,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/ini-test/ini-test.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/iotest/iotest.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/iptceasy/iptceasy.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/iptcprint/iptcprint.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/iptctest/iptctest.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/key-test/key-test.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/largeiptc-test/largeiptc-test.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/libexiv2/libexiv2.vcproj

@@ -45,7 +45,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;LIBSSH_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -116,7 +116,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;LIBSSH_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -186,7 +186,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;LIBSSH_STATIC"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -254,7 +254,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;LIBSSH_STATIC"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -320,7 +320,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;EXV_HAVE_DLL;EXV_BUILDING_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -401,7 +401,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;EXV_HAVE_DLL;EXV_BUILDING_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -481,7 +481,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="1"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;EXV_HAVE_DLL;EXV_BUILDING_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -561,7 +561,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="1"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;EXV_HAVE_DLL;EXV_BUILDING_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/metacopy/metacopy.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)../include&quot;;&quot;$(SolutionDir)../include/exiv2&quot;;&quot;$(SolutionDir)../src&quot;;&quot;$(SolutionDir)../xmpsdk/include&quot;;&quot;$(SolutionDir)../../expat/lib&quot;;&quot;$(SolutionDir)../../zlib&quot;;&quot;$(SolutionDir)/../../curl/include&quot;;&quot;$(SolutionDir)/../../libssh/include&quot;;&quot;$(SolutionDir)xssl/Win32/Release/include&quot;"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)../../include&quot;;&quot;$(ProjectDir)../../include/exiv2&quot;;&quot;$(ProjectDir)../../src&quot;;&quot;$(ProjectDir)../../xmpsdk/include&quot;;&quot;$(ProjectDir)../../../expat/lib&quot;;&quot;$(ProjectDir)../../../zlib&quot;;&quot;$(SolutionDir)/../../curl/include&quot;;&quot;$(SolutionDir)/../../libssh/include&quot;;&quot;$(SolutionDir)xssl/Win32/Release/include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)../include&quot;;&quot;$(SolutionDir)../include/exiv2&quot;;&quot;$(SolutionDir)../src&quot;;&quot;$(SolutionDir)../xmpsdk/include&quot;;&quot;$(SolutionDir)../../expat/lib&quot;;&quot;$(SolutionDir)../../zlib&quot;;&quot;$(SolutionDir)/../../curl/include&quot;;&quot;$(SolutionDir)/../../libssh/include&quot;;&quot;$(SolutionDir)xssl/Win32/Release/include&quot;"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)../../include&quot;;&quot;$(ProjectDir)../../include/exiv2&quot;;&quot;$(ProjectDir)../../src&quot;;&quot;$(ProjectDir)../../xmpsdk/include&quot;;&quot;$(ProjectDir)../../../expat/lib&quot;;&quot;$(ProjectDir)../../../zlib&quot;;&quot;$(SolutionDir)/../../curl/include&quot;;&quot;$(SolutionDir)/../../libssh/include&quot;;&quot;$(SolutionDir)xssl/Win32/Release/include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)../include&quot;;&quot;$(SolutionDir)../include/exiv2&quot;;&quot;$(SolutionDir)../src&quot;;&quot;$(SolutionDir)../xmpsdk/include&quot;;&quot;$(SolutionDir)../../expat/lib&quot;;&quot;$(SolutionDir)../../zlib&quot;;&quot;$(SolutionDir)/../../curl/include&quot;;&quot;$(SolutionDir)/../../libssh/include&quot;;&quot;$(SolutionDir)xssl/Win32/Release/include&quot;"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)../../include&quot;;&quot;$(ProjectDir)../../include/exiv2&quot;;&quot;$(ProjectDir)../../src&quot;;&quot;$(ProjectDir)../../xmpsdk/include&quot;;&quot;$(ProjectDir)../../../expat/lib&quot;;&quot;$(ProjectDir)../../../zlib&quot;;&quot;$(SolutionDir)/../../curl/include&quot;;&quot;$(SolutionDir)/../../libssh/include&quot;;&quot;$(SolutionDir)xssl/Win32/Release/include&quot;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)../include&quot;;&quot;$(SolutionDir)../include/exiv2&quot;;&quot;$(SolutionDir)../src&quot;;&quot;$(SolutionDir)../xmpsdk/include&quot;;&quot;$(SolutionDir)../../expat/lib&quot;;&quot;$(SolutionDir)../../zlib&quot;;&quot;$(SolutionDir)/../../curl/include&quot;;&quot;$(SolutionDir)/../../libssh/include&quot;;&quot;$(SolutionDir)xssl/Win32/Release/include&quot;"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)../../include&quot;;&quot;$(ProjectDir)../../include/exiv2&quot;;&quot;$(ProjectDir)../../src&quot;;&quot;$(ProjectDir)../../xmpsdk/include&quot;;&quot;$(ProjectDir)../../../expat/lib&quot;;&quot;$(ProjectDir)../../../zlib&quot;;&quot;$(SolutionDir)/../../curl/include&quot;;&quot;$(SolutionDir)/../../libssh/include&quot;;&quot;$(SolutionDir)xssl/Win32/Release/include&quot;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)../include&quot;;&quot;$(SolutionDir)../include/exiv2&quot;;&quot;$(SolutionDir)../src&quot;;&quot;$(SolutionDir)../xmpsdk/include&quot;;&quot;$(SolutionDir)../../expat/lib&quot;;&quot;$(SolutionDir)../../zlib&quot;;&quot;$(SolutionDir)/../../curl/include&quot;;&quot;$(SolutionDir)/../../libssh/include&quot;;&quot;$(SolutionDir)xssl/Win32/Release/include&quot;"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)../../include&quot;;&quot;$(ProjectDir)../../include/exiv2&quot;;&quot;$(ProjectDir)../../src&quot;;&quot;$(ProjectDir)../../xmpsdk/include&quot;;&quot;$(ProjectDir)../../../expat/lib&quot;;&quot;$(ProjectDir)../../../zlib&quot;;&quot;$(SolutionDir)/../../curl/include&quot;;&quot;$(SolutionDir)/../../libssh/include&quot;;&quot;$(SolutionDir)xssl/Win32/Release/include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)../include&quot;;&quot;$(SolutionDir)../include/exiv2&quot;;&quot;$(SolutionDir)../src&quot;;&quot;$(SolutionDir)../xmpsdk/include&quot;;&quot;$(SolutionDir)../../expat/lib&quot;;&quot;$(SolutionDir)../../zlib&quot;;&quot;$(SolutionDir)/../../curl/include&quot;;&quot;$(SolutionDir)/../../libssh/include&quot;;&quot;$(SolutionDir)xssl/Win32/Release/include&quot;"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)../../include&quot;;&quot;$(ProjectDir)../../include/exiv2&quot;;&quot;$(ProjectDir)../../src&quot;;&quot;$(ProjectDir)../../xmpsdk/include&quot;;&quot;$(ProjectDir)../../../expat/lib&quot;;&quot;$(ProjectDir)../../../zlib&quot;;&quot;$(SolutionDir)/../../curl/include&quot;;&quot;$(SolutionDir)/../../libssh/include&quot;;&quot;$(SolutionDir)xssl/Win32/Release/include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)../include&quot;;&quot;$(SolutionDir)../include/exiv2&quot;;&quot;$(SolutionDir)../src&quot;;&quot;$(SolutionDir)../xmpsdk/include&quot;;&quot;$(SolutionDir)../../expat/lib&quot;;&quot;$(SolutionDir)../../zlib&quot;;&quot;$(SolutionDir)/../../curl/include&quot;;&quot;$(SolutionDir)/../../libssh/include&quot;;&quot;$(SolutionDir)xssl/Win32/Release/include&quot;"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)../../include&quot;;&quot;$(ProjectDir)../../include/exiv2&quot;;&quot;$(ProjectDir)../../src&quot;;&quot;$(ProjectDir)../../xmpsdk/include&quot;;&quot;$(ProjectDir)../../../expat/lib&quot;;&quot;$(ProjectDir)../../../zlib&quot;;&quot;$(SolutionDir)/../../curl/include&quot;;&quot;$(SolutionDir)/../../libssh/include&quot;;&quot;$(SolutionDir)xssl/Win32/Release/include&quot;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)../include&quot;;&quot;$(SolutionDir)../include/exiv2&quot;;&quot;$(SolutionDir)../src&quot;;&quot;$(SolutionDir)../xmpsdk/include&quot;;&quot;$(SolutionDir)../../expat/lib&quot;;&quot;$(SolutionDir)../../zlib&quot;;&quot;$(SolutionDir)/../../curl/include&quot;;&quot;$(SolutionDir)/../../libssh/include&quot;;&quot;$(SolutionDir)xssl/Win32/Release/include&quot;"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)../../include&quot;;&quot;$(ProjectDir)../../include/exiv2&quot;;&quot;$(ProjectDir)../../src&quot;;&quot;$(ProjectDir)../../xmpsdk/include&quot;;&quot;$(ProjectDir)../../../expat/lib&quot;;&quot;$(ProjectDir)../../../zlib&quot;;&quot;$(SolutionDir)/../../curl/include&quot;;&quot;$(SolutionDir)/../../libssh/include&quot;;&quot;$(SolutionDir)xssl/Win32/Release/include&quot;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/mmap-test/mmap-test.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/path-test/path-test.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../src;$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../src;$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../src;$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../src;$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../src;$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../src;$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../src;$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../src;$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../src;$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../src;$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../src;$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../src;$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../src;$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../src;$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../src;$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../src;$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/prevtest/prevtest.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/remotetest/remotetest.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -128,7 +128,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -210,7 +210,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -291,7 +291,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -372,7 +372,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -455,7 +455,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -536,7 +536,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -619,7 +619,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/stringto-test/stringto-test.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/taglist/taglist.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/tiff-test/tiff-test.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/utiltest/utiltest.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/werror-test/werror-test.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/write-test/write-test.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/write2-test/write2-test.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/xmpparse/xmpparse.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/xmpparser-test/xmpparser-test.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"

msvc2005/xmpsample/xmpsample.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -286,7 +286,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -448,7 +448,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -528,7 +528,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -610,7 +610,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
+				AdditionalIncludeDirectories="$(ProjectDir)../../include;$(ProjectDir)../../include/exiv2;$(ProjectDir)../../src;$(ProjectDir)../../xmpsdk/include;$(ProjectDir)../../../expat/lib;$(ProjectDir)../../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"