SLNKDWFProps.vsprops toegevoegd en meer $(TEMP) gebruik zodat eenvoudiger tussen compile omgevingen wisselen

svn path=/Slnkdwf/trunk/; revision=20031
2013-12-02 19:28:30 +00:00
parent 29c807dd00
commit 4b1f0a3dd5
28 changed files with 130 additions and 144 deletions
--- a/Barcode/bblib.vcproj
+++ b/Barcode/bblib.vcproj
@@ -18,9 +18,8 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\..\Release"
-			IntermediateDirectory="D:\Temp\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="$(TEMP)\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -96,9 +95,8 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\..\Debug"
-			IntermediateDirectory="D:\Temp\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="$(TEMP)\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -175,7 +173,6 @@
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
--- a/QRCode/QRCode.vcproj
+++ b/QRCode/QRCode.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="D:\Temp\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="$(TEMP)\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			UseOfATL="1"
 			CharacterSet="2"
@@ -81,7 +81,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\..\Release"
-			IntermediateDirectory="D:\Temp\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="$(TEMP)\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			UseOfATL="1"
 			CharacterSet="2"
--- a/RemoveAbout/RemoveAbout.vcproj
+++ b/RemoveAbout/RemoveAbout.vcproj
@@ -17,7 +17,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="D:\Temp\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="$(TEMP)\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -88,7 +88,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="D:\Temp\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="$(TEMP)\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -100,7 +100,7 @@
 			<Tool
 				Name="VCCustomBuildTool"
 				Description="Forceer correcte _TIME_"
-				CommandLine="if exist d:\Temp\Slnkdwf\SLNKDWFCom\Release\About.obj del d:\Temp\Slnkdwf\SLNKDWFCom\Release\About.obj &#x0D;&#x0A;"
+				CommandLine="if exist d:\Temp\Slnkdwf\SLNKDWFCom\Release\About.obj del d:\Temp\Slnkdwf\SLNKDWFCom\Release\About.obj&#x0D;&#x0A;"
 				AdditionalDependencies=""
 				Outputs="NOTEXIST"
 			/>
--- a/SLNKDWF.sln
+++ b/SLNKDWF.sln
@@ -2,8 +2,8 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SLNKDWFViewer", "Standalone\SLNKDWFViewer.vcproj", "{B2601E72-4FF4-4B9C-A89F-C2E7DACF36FD}"
 	ProjectSection(ProjectDependencies) = postProject
-		{6DFC9788-904C-4724-A734-06634061EF00} = {6DFC9788-904C-4724-A734-06634061EF00}
 		{CF524F70-4DDD-4040-803B-41B5DE7B1CF9} = {CF524F70-4DDD-4040-803B-41B5DE7B1CF9}
+		{6DFC9788-904C-4724-A734-06634061EF00} = {6DFC9788-904C-4724-A734-06634061EF00}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Viewer", "Viewer\Viewer.vcproj", "{6DFC9788-904C-4724-A734-06634061EF00}"
@@ -32,8 +32,8 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SLNKDWFCom", "SlnkDWFCom\SLNKDWF.vcproj", "{7F9F1060-C14D-4DD5-91D3-FA7263FECF5E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{89BE476D-6C02-4514-BFCE-256106D98713} = {89BE476D-6C02-4514-BFCE-256106D98713}
-		{3EA5B7D3-EA9B-420B-B283-0D92E620B970} = {3EA5B7D3-EA9B-420B-B283-0D92E620B970}
 		{0E49D578-377F-4C07-8339-8737AA9FA0EC} = {0E49D578-377F-4C07-8339-8737AA9FA0EC}
+		{3EA5B7D3-EA9B-420B-B283-0D92E620B970} = {3EA5B7D3-EA9B-420B-B283-0D92E620B970}
 		{6EA5FCEC-1DB0-4542-8E41-9423021BD460} = {6EA5FCEC-1DB0-4542-8E41-9423021BD460}
 	EndProjectSection
 EndProject
@@ -47,8 +47,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bblib", "Barcode\bblib.vcpr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QRCode", "QRCode\QRCode.vcproj", "{3EA5B7D3-EA9B-420B-B283-0D92E620B970}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CxImage", "SlnkDWFImpl\CxImage\CxImage\cximage.vcproj", "{C8E16319-530C-47D5-BED8-B18AB41FC01F}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -106,12 +104,6 @@ Global
 		{3EA5B7D3-EA9B-420B-B283-0D92E620B970}.Release MT|Win32.Build.0 = Release|Win32
 		{3EA5B7D3-EA9B-420B-B283-0D92E620B970}.Release|Win32.ActiveCfg = Release|Win32
 		{3EA5B7D3-EA9B-420B-B283-0D92E620B970}.Release|Win32.Build.0 = Release|Win32
-		{C8E16319-530C-47D5-BED8-B18AB41FC01F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C8E16319-530C-47D5-BED8-B18AB41FC01F}.Debug|Win32.Build.0 = Debug|Win32
-		{C8E16319-530C-47D5-BED8-B18AB41FC01F}.Release MT|Win32.ActiveCfg = Release|Win32
-		{C8E16319-530C-47D5-BED8-B18AB41FC01F}.Release MT|Win32.Build.0 = Release|Win32
-		{C8E16319-530C-47D5-BED8-B18AB41FC01F}.Release|Win32.ActiveCfg = Release|Win32
-		{C8E16319-530C-47D5-BED8-B18AB41FC01F}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/SLNKDWFProps.vsprops
+++ b/SLNKDWFProps.vsprops
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="SLNKDWFProps"
+	IntermediateDirectory="$(TEMP)\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
+	/>
+	<UserMacro
+		Name="DWFTKPATH"
+		Value="x:\Library\Dwf702\develop\global"
+	/>
+</VisualStudioPropertySheet>
--- a/SlnkDWFCom/SLNKDWF.vcproj
+++ b/SlnkDWFCom/SLNKDWF.vcproj
@@ -18,9 +18,9 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="Debug"
-			IntermediateDirectory="D:\Temp\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="$(TEMP)\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+			InheritedPropertySheets="..\SLNKDWFProps.vsprops"
 			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -52,7 +52,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="d:\library\Dwf702\develop\global\src\dwf;d:\Library\Dwf702\develop\global\src\;..\SlnkDWFImpl"
+				AdditionalIncludeDirectories="$(DWFTKPATH)\src\dwf;$(DWFTKPATH)\src\;..\SlnkDWFImpl"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_MERGE_PROXYSTUB;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -83,7 +83,7 @@
 				AdditionalDependencies="..\SlnkdwfImpl\DebugRW\SLNKDWFStaticRW.lib Secur32.lib  ..\debug\bblib.lib ..\debug\qrcode.lib"
 				OutputFile="d:\SLNKDWF.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="d:\Library\Dwf702\develop\global\lib\static\debug\vc8.0"
+				AdditionalLibraryDirectories="$(DWFTKPATH)\lib\static\debug\vc8.0"
 				IgnoreDefaultLibraryNames=""
 				ModuleDefinitionFile=".\SLNKDWF.def"
 				GenerateDebugInformation="true"
@@ -122,9 +122,9 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="Release"
-			IntermediateDirectory="D:\Temp\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="$(TEMP)\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+			InheritedPropertySheets="..\SLNKDWFProps.vsprops"
 			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -161,8 +161,8 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="d:\library\Dwf702\develop\global\src\dwf;d:\Library\Dwf702\develop\global\src\;..\SlnkDWFImpl"
-				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_MERGE_PROXYSTUB;_CRT_SECURE_NO_DEPRECATE"
+				AdditionalIncludeDirectories="$(DWFTKPATH)\src\dwf;$(DWFTKPATH)\src\;..\SlnkDWFImpl"
+				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_MERGE_PROXYSTUB;_CRT_SECURE_NO_DEPRECATE;SHA1_NO_STL_FUNCTIONS"
 				GeneratePreprocessedFile="0"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -192,9 +192,9 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalDependencies="..\SlnkdwfImpl\ReleaseRW\SLNKDWFStaticRW.lib Secur32.lib ..\release\bblib.lib ..\release\qrcode.lib"
-				OutputFile="D:\SLNKDWF.dll"
+				OutputFile="C:\SLNKDWF.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="d:\library\Dwf702\develop\global\lib\static\release\vc8.0;.\CxImage\"
+				AdditionalLibraryDirectories="$(DWFTKPATH)\lib\static\release\vc8.0;.\CxImage\"
 				ModuleDefinitionFile=".\SLNKDWF.def"
 				GenerateDebugInformation="false"
 				SubSystem="2"
@@ -236,7 +236,7 @@
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+			InheritedPropertySheets="..\SLNKDWFProps.vsprops"
 			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -273,7 +273,7 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="d:\library\Dwf702\develop\global\src\dwf;d:\Library\Dwf702\develop\global\src\;..\SlnkDWFImpl"
+				AdditionalIncludeDirectories="$(DWFTKPATH)\src\dwf;$(DWFTKPATH)\src\;..\SlnkDWFImpl"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_MERGE_PROXYSTUB;_CRT_SECURE_NO_DEPRECATE"
 				GeneratePreprocessedFile="0"
 				StringPooling="true"
@@ -306,7 +306,7 @@
 				AdditionalDependencies="&quot;..\SlnkdwfImpl\Release MT\SLNKDWFStaticRW.lib&quot; Secur32.lib &quot;..\Barcode\Release MT\bblib.lib&quot;"
 				OutputFile="D:\SLNKDWF.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="d:\library\Dwf702\develop\global\lib\static\release\vc8.0;.\CxImage\"
+				AdditionalLibraryDirectories="$(DWFTKPATH)\lib\static\release\vc8.0;.\CxImage\"
 				ModuleDefinitionFile=".\SLNKDWF.def"
 				GenerateDebugInformation="false"
 				SubSystem="2"
--- a/SlnkDWFCom/WhipFile.cpp
+++ b/SlnkDWFCom/WhipFile.cpp
@@ -23,8 +23,6 @@
 #include "WhipFile.h"
 #include "SLNKContour.h"

-#include "Dwfcore/Mime.h"
-
 //
 // WHIPFILE.CPP
 //
@@ -831,6 +829,7 @@ bool CWhipFile::GenerateContouren(WT_File &my_planfile, myWT_File &my_file,
 	WT_Layer keepLayer = my_planfile.rendition().layer();
 	WT_Color keepColor = my_planfile.rendition().color();
 	WT_Line_Style keepStyle = my_planfile.rendition().line_style();
+	WT_Font keepFont = my_planfile.rendition().font();

 	// Vertrouw de huidige rendition niet!
 	WT_Color().serialize(my_file);
@@ -881,6 +880,8 @@ bool CWhipFile::GenerateContouren(WT_File &my_planfile, myWT_File &my_file,
 	keepColor.serialize(my_file); // Zeker terugzetten
 	my_file.desired_rendition().line_style() = my_file.rendition().line_style() = keepStyle;
 	keepStyle.serialize(my_file); //
+	my_file.desired_rendition().font() = my_file.rendition().font() = keepFont;
+	keepFont.serialize(my_file); //

 	return true;
 }
--- a/SlnkDWFImpl/CxImage/CxImage/CxImageDLL/CxImageCrtDll.vcproj
+++ b/SlnkDWFImpl/CxImage/CxImage/CxImageDLL/CxImageCrtDll.vcproj
@@ -16,9 +16,8 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
 			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			InheritedPropertySheets="..\CxImage.vsprops;..\..\..\SLNKDWFProps.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -111,9 +110,8 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
 			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			InheritedPropertySheets="..\CxImage.vsprops;..\..\..\SLNKDWFProps.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
--- a/SlnkDWFImpl/CxImage/CxImage/CxImageDLL/cximagemfcdll.vcproj
+++ b/SlnkDWFImpl/CxImage/CxImage/CxImageDLL/cximagemfcdll.vcproj
@@ -17,9 +17,8 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
 			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			InheritedPropertySheets="..\CxImage.vsprops;..\..\..\SLNKDWFProps.vsprops"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -113,9 +112,8 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
 			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			InheritedPropertySheets="..\CxImage.vsprops;..\..\..\SLNKDWFProps.vsprops"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
--- a/SlnkDWFImpl/CxImage/CxImage/cximage.vcproj
+++ b/SlnkDWFImpl/CxImage/CxImage/cximage.vcproj
@@ -17,9 +17,8 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops;..\CxImage.vsprops"
+			InheritedPropertySheets="..\CxImage.vsprops;..\..\..\SLNKDWFProps.vsprops"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -92,9 +91,8 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops;..\CxImage.vsprops"
+			InheritedPropertySheets="..\CxImage.vsprops;..\..\..\SLNKDWFProps.vsprops"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
--- a/SlnkDWFImpl/CxImage/CxImage/cximage2003.vcproj
+++ b/SlnkDWFImpl/CxImage/CxImage/cximage2003.vcproj
@@ -15,7 +15,6 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -59,7 +58,6 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
 			ConfigurationType="4"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
--- a/SlnkDWFImpl/CxImage/demo/demo.vcproj
+++ b/SlnkDWFImpl/CxImage/demo/demo.vcproj
@@ -17,9 +17,8 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			InheritedPropertySheets="..\CxImage.vsprops;..\..\..\SLNKDWFProps.vsprops"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -112,9 +111,8 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			InheritedPropertySheets="..\CxImage.vsprops;..\..\..\SLNKDWFProps.vsprops"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
--- a/SlnkDWFImpl/CxImage/demo/demoDLL.vcproj
+++ b/SlnkDWFImpl/CxImage/demo/demoDLL.vcproj
@@ -17,9 +17,8 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\ReleaseDll"
-			IntermediateDirectory=".\ReleaseDll"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			InheritedPropertySheets="..\CxImage.vsprops;..\..\..\SLNKDWFProps.vsprops"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -112,9 +111,8 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\DebugDll"
-			IntermediateDirectory=".\DebugDll"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			InheritedPropertySheets="..\CxImage.vsprops;..\..\..\SLNKDWFProps.vsprops"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
--- a/SlnkDWFImpl/CxImage/demo2/Console.vcproj
+++ b/SlnkDWFImpl/CxImage/demo2/Console.vcproj
@@ -14,7 +14,6 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -68,7 +67,6 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
--- a/SlnkDWFImpl/CxImage/j2k/j2k.vcproj
+++ b/SlnkDWFImpl/CxImage/j2k/j2k.vcproj
@@ -17,9 +17,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -89,9 +87,8 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			InheritedPropertySheets="..\CxImage.vsprops;..\..\..\SLNKDWFProps.vsprops"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
--- a/SlnkDWFImpl/CxImage/jasper/jasper.vcproj
+++ b/SlnkDWFImpl/CxImage/jasper/jasper.vcproj
@@ -16,9 +16,8 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			InheritedPropertySheets="..\CxImage.vsprops;..\..\..\SLNKDWFProps.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -91,9 +90,8 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			InheritedPropertySheets="..\CxImage.vsprops;..\..\..\SLNKDWFProps.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
--- a/SlnkDWFImpl/CxImage/jbig/jbig.vcproj
+++ b/SlnkDWFImpl/CxImage/jbig/jbig.vcproj
@@ -17,9 +17,8 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			InheritedPropertySheets="..\CxImage.vsprops;..\..\..\SLNKDWFProps.vsprops"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -91,9 +90,8 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			InheritedPropertySheets="..\CxImage.vsprops;..\..\..\SLNKDWFProps.vsprops"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
--- a/SlnkDWFImpl/CxImage/jpeg/Jpeg.vcproj
+++ b/SlnkDWFImpl/CxImage/jpeg/Jpeg.vcproj
@@ -17,9 +17,8 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops;..\CxImage.vsprops"
+			InheritedPropertySheets="..\CxImage.vsprops;..\..\..\SLNKDWFProps.vsprops"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			>
@@ -87,9 +86,8 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops;..\CxImage.vsprops"
+			InheritedPropertySheets="..\CxImage.vsprops;..\..\..\SLNKDWFProps.vsprops"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			>
--- a/SlnkDWFImpl/CxImage/png/png.vcproj
+++ b/SlnkDWFImpl/CxImage/png/png.vcproj
@@ -17,9 +17,8 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops;..\CxImage.vsprops"
+			InheritedPropertySheets="..\CxImage.vsprops;..\..\..\SLNKDWFProps.vsprops"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -89,9 +88,8 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops;..\CxImage.vsprops"
+			InheritedPropertySheets="..\CxImage.vsprops;..\..\..\SLNKDWFProps.vsprops"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
--- a/SlnkDWFImpl/CxImage/tiff/Tiff.vcproj
+++ b/SlnkDWFImpl/CxImage/tiff/Tiff.vcproj
@@ -18,9 +18,8 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops;..\CxImage.vsprops"
+			InheritedPropertySheets="..\CxImage.vsprops;..\..\..\SLNKDWFProps.vsprops"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -93,9 +92,8 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops;..\CxImage.vsprops"
+			InheritedPropertySheets="..\CxImage.vsprops;..\..\..\SLNKDWFProps.vsprops"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
--- a/SlnkDWFImpl/CxImage/zlib/zlib.vcproj
+++ b/SlnkDWFImpl/CxImage/zlib/zlib.vcproj
@@ -17,9 +17,8 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			InheritedPropertySheets="..\CxImage.vsprops;..\..\..\SLNKDWFProps.vsprops"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -88,9 +87,8 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			InheritedPropertySheets="..\CxImage.vsprops;..\..\..\SLNKDWFProps.vsprops"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
--- a/SlnkDWFImpl/SLNKDWFStaticRO.vcproj
+++ b/SlnkDWFImpl/SLNKDWFStaticRO.vcproj
@@ -18,9 +18,9 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="DebugRO"
-			IntermediateDirectory="D:\Temp\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="$(TEMP)\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+			InheritedPropertySheets="..\SLNKDWFProps.vsprops"
 			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -52,7 +52,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="d:\library\Dwf702\develop\global\src\dwf;d:\Library\Dwf702\develop\global\src\;.\CImage\Zlib"
+				AdditionalIncludeDirectories="$(DWFTKPATH)\src\dwf;$(DWFTKPATH)\src\;.\CImage\Zlib"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_CRT_SECURE_NO_DEPRECATE;DWFTK_READ_ONLY"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -79,7 +79,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalDependencies="dwfcore.1.0.2.lib dwftk_ro.7.0.2.lib whiptk_ro.7.6.600.lib msimg32.lib Secur32.lib"
-				AdditionalLibraryDirectories="d:\library\Dwf702\develop\global\lib\static\debug\vc8.0;.\CxImage\"
+				AdditionalLibraryDirectories="$(DWFTKPATH)\lib\static\debug\vc8.0;.\CxImage\"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -101,9 +101,9 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="ReleaseRO"
-			IntermediateDirectory="D:\Temp\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="$(TEMP)\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+			InheritedPropertySheets="..\SLNKDWFProps.vsprops"
 			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -139,7 +139,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="d:\Library\Dwf702\develop\global\src\dwf;d:\Library\Dwf702\develop\global\src\;.\CxImage\Zlib"
+				AdditionalIncludeDirectories="$(DWFTKPATH)\src\dwf;$(DWFTKPATH)\src\;.\CxImage\Zlib"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_CRT_SECURE_NO_DEPRECATE;DWFTK_READ_ONLY"
 				GeneratePreprocessedFile="0"
 				StringPooling="true"
@@ -169,7 +169,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalDependencies="msimg32.lib dwfcore.1.0.2.lib dwftk_ro.7.0.2.lib whiptk_ro.7.6.600.lib"
-				AdditionalLibraryDirectories="d:\library\Dwf702\develop\global\lib\static\release\vc8.0"
+				AdditionalLibraryDirectories="$(DWFTKPATH)\lib\static\release\vc8.0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -193,7 +193,7 @@
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+			InheritedPropertySheets="..\SLNKDWFProps.vsprops"
 			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -229,7 +229,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="d:\Library\Dwf702\develop\global\src\dwf;d:\Library\Dwf702\develop\global\src\;.\CxImage\Zlib"
+				AdditionalIncludeDirectories="$(DWFTKPATH)\src\dwf;$(DWFTKPATH)\src\;.\CxImage\Zlib"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_CRT_SECURE_NO_DEPRECATE;DWFTK_READ_ONLY"
 				GeneratePreprocessedFile="0"
 				StringPooling="true"
@@ -259,7 +259,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalDependencies="msimg32.lib dwfcore.1.0.2.lib dwftk_ro.7.0.2.lib whiptk_ro.7.6.600.lib"
-				AdditionalLibraryDirectories="d:\library\Dwf702\develop\global\lib\static\release\vc8.0"
+				AdditionalLibraryDirectories="$(DWFTKPATH)\lib\static\release\vc8.0"
 			/>
 			<Tool
 				Name="VCALinkTool"
--- a/SlnkDWFImpl/SLNKDWFStaticRW.vcproj
+++ b/SlnkDWFImpl/SLNKDWFStaticRW.vcproj
@@ -18,9 +18,9 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="DebugRW"
-			IntermediateDirectory="D:\Temp\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="$(TEMP)\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+			InheritedPropertySheets="..\SLNKDWFProps.vsprops"
 			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -52,7 +52,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="d:\library\Dwf702\develop\global\src\dwf;d:\Library\Dwf702\develop\global\src\;.\CImage\Zlib"
+				AdditionalIncludeDirectories="$(DWFTKPATH)\src\dwf;$(DWFTKPATH)\src\;.\CImage\Zlib"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -79,7 +79,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalDependencies="dwfcore.1.0.2.lib dwftk.7.0.2.lib whiptk.7.6.600.lib msimg32.lib Secur32.lib"
-				AdditionalLibraryDirectories="d:\library\Dwf702\develop\global\lib\static\debug\vc8.0;.\CxImage\"
+				AdditionalLibraryDirectories="$(DWFTKPATH)\lib\static\debug\vc8.0;.\CxImage\"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -101,9 +101,9 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="ReleaseRW"
-			IntermediateDirectory="D:\Temp\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="$(TEMP)\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+			InheritedPropertySheets="..\SLNKDWFProps.vsprops"
 			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -139,7 +139,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="d:\Library\Dwf702\develop\global\src\dwf;d:\Library\Dwf702\develop\global\src\;.\CxImage\Zlib"
+				AdditionalIncludeDirectories="&quot;$(DWFTKPATH)\src\dwf&quot;;&quot;$(DWFTKPATH)\src\&quot;;.\CxImage\Zlib"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_CRT_SECURE_NO_DEPRECATE"
 				GeneratePreprocessedFile="0"
 				StringPooling="true"
@@ -169,7 +169,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalDependencies="msimg32.lib dwfcore.1.0.2.lib dwftk.7.0.2.lib whiptk.7.6.600.lib"
-				AdditionalLibraryDirectories="d:\library\Dwf702\develop\global\lib\static\release\vc8.0"
+				AdditionalLibraryDirectories="$(DWFTKPATH)\lib\static\release\vc8.0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -193,7 +193,7 @@
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+			InheritedPropertySheets="..\SLNKDWFProps.vsprops"
 			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -229,7 +229,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="d:\Library\Dwf702\develop\global\src\dwf;d:\Library\Dwf702\develop\global\src\;.\CxImage\Zlib"
+				AdditionalIncludeDirectories="$(DWFTKPATH)\src\dwf;$(DWFTKPATH)\src\;.\CxImage\Zlib"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_CRT_SECURE_NO_DEPRECATE"
 				GeneratePreprocessedFile="0"
 				StringPooling="true"
@@ -259,7 +259,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalDependencies="msimg32.lib dwfcore.1.0.2.lib dwftk.7.0.2.lib whiptk.7.6.600.lib"
-				AdditionalLibraryDirectories="&quot;d:\Library\Dwf702\develop\global\build\VC 8.0\DWFCore\Release (Read-Write LIB) MT&quot;;&quot;d:\Library\Dwf702\develop\global\build\VC 8.0\DWFToolkit\Release (Read-Write LIB) MT&quot;;&quot;d:\Library\Dwf702\develop\global\build\VC 8.0\WhipToolkit\Release (Read-Write LIB) MT&quot;"
+				AdditionalLibraryDirectories="&quot;$(DWFTKPATH)\build\VC 8.0\DWFCore\Release (Read-Write LIB) MT&quot;;&quot;$(DWFTKPATH)\build\VC 8.0\DWFToolkit\Release (Read-Write LIB) MT&quot;;&quot;$(DWFTKPATH)\build\VC 8.0\WhipToolkit\Release (Read-Write LIB) MT&quot;"
 			/>
 			<Tool
 				Name="VCALinkTool"
--- a/Standalone/SLNKDWFViewer.vcproj
+++ b/Standalone/SLNKDWFViewer.vcproj
@@ -17,8 +17,9 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="Debug"
-			IntermediateDirectory="D:\Temp\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="$(TEMP)\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
+			InheritedPropertySheets="..\SLNKDWFProps.vsprops"
 			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -50,7 +51,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Wtl81\include;d:\Library\Dwf702\develop\global\src\dwf;d:\Library\Dwf702\develop\global\src\"
+				AdditionalIncludeDirectories="..\Wtl81\include;$(DWFTKPATH)\src\dwf;$(DWFTKPATH)\src\"
 				PreprocessorDefinitions="WIN32;_WINDOWS;STRICT;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -108,8 +109,9 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="Release"
-			IntermediateDirectory="D:\Temp\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="$(TEMP)\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
+			InheritedPropertySheets="..\SLNKDWFProps.vsprops"
 			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -140,7 +142,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\Wtl81\include;d:\Library\Dwf702\develop\global\src\dwf;d:\Library\Dwf702\develop\global\src\;.\CxImage\Zlib"
+				AdditionalIncludeDirectories="..\Wtl81\include;$(DWFTKPATH)\src\dwf;$(DWFTKPATH)\src\;.\CxImage\Zlib"
 				PreprocessorDefinitions="WIN32;_WINDOWS;STRICT;NDEBUG;_CRT_SECURE_NO_DEPRECATE"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -201,6 +203,7 @@
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
+			InheritedPropertySheets="..\SLNKDWFProps.vsprops"
 			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -231,7 +234,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="d:\Library\Wtl80\include;d:\Library\Dwf702\develop\global\src\dwf;d:\Library\Dwf702\develop\global\src\;.\CxImage\Zlib"
+				AdditionalIncludeDirectories="d:\Library\Wtl80\include;$(DWFTKPATH)\src\dwf;$(DWFTKPATH)\src\;.\CxImage\Zlib"
 				PreprocessorDefinitions="WIN32;_WINDOWS;STRICT;NDEBUG;_CRT_SECURE_NO_DEPRECATE"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
--- a/Viewer/Viewer.vcproj
+++ b/Viewer/Viewer.vcproj
@@ -17,8 +17,9 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="D:\Temp\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="$(TEMP)\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\SLNKDWFProps.vsprops"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -39,7 +40,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm118"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Wtl81\include;d:\Library\Dwf702\develop\global\src\dwf;d:\Library\Dwf702\develop\global\src\;"
+				AdditionalIncludeDirectories="..\Wtl81\include;$(DWFTKPATH)\src\dwf;$(DWFTKPATH)\src\;"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="3"
 				TreatWChar_tAsBuiltInType="false"
@@ -78,8 +79,9 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="D:\Temp\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="$(TEMP)\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\SLNKDWFProps.vsprops"
 			UseOfATL="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			>
@@ -101,7 +103,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm118"
-				AdditionalIncludeDirectories="..\Wtl81\include;d:\Library\Dwf702\develop\global\src\dwf;d:\Library\Dwf702\develop\global\src\;.\CxImage\Zlib"
+				AdditionalIncludeDirectories="..\Wtl81\include;$(DWFTKPATH)\src\dwf;$(DWFTKPATH)\src\;.\CxImage\Zlib"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="2"
 				TreatWChar_tAsBuiltInType="false"
@@ -142,6 +144,7 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\SLNKDWFProps.vsprops"
 			UseOfATL="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			>
@@ -163,7 +166,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm118"
-				AdditionalIncludeDirectories="d:\Library\Wtl80\include;d:\Library\Dwf702\develop\global\src\dwf;d:\Library\Dwf702\develop\global\src\;.\CxImage\Zlib"
+				AdditionalIncludeDirectories="d:\Library\Wtl80\include;$(DWFTKPATH)\src\dwf;$(DWFTKPATH)\src\;.\CxImage\Zlib"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="2"
 				TreatWChar_tAsBuiltInType="false"
--- a/WincmdContent/filesys.vcproj
+++ b/WincmdContent/filesys.vcproj
@@ -17,9 +17,9 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
-			IntermediateDirectory="D:\Temp\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="$(TEMP)\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			InheritedPropertySheets="..\SLNKDWFProps.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -49,7 +49,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Wtl81\include;d:\Library\Dwf702\develop\global\src\dwf;d:\Library\Dwf702\develop\global\src\;.\CxImage\Zlib"
+				AdditionalIncludeDirectories="..\Wtl81\include;$(DWFTKPATH)\src\dwf;$(DWFTKPATH)\src\;.\CxImage\Zlib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FILESYS_EXPORTS;;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -115,9 +115,9 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
-			IntermediateDirectory="D:\Temp\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="$(TEMP)\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			InheritedPropertySheets="..\SLNKDWFProps.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -146,7 +146,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Wtl81\include;d:\Library\Dwf702\develop\global\src\dwf;d:\Library\Dwf702\develop\global\src\"
+				AdditionalIncludeDirectories="..\Wtl81\include;$(DWFTKPATH)\src\dwf;$(DWFTKPATH)\src\"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FILESYS_EXPORTS;;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -216,7 +216,7 @@
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			InheritedPropertySheets="..\SLNKDWFProps.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -246,7 +246,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="d:\Library\Wtl80\include;d:\Library\Dwf702\develop\global\src\dwf;d:\Library\Dwf702\develop\global\src\;.\CxImage\Zlib"
+				AdditionalIncludeDirectories="d:\Library\Wtl80\include;$(DWFTKPATH)\src\dwf;$(DWFTKPATH)\src\;.\CxImage\Zlib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FILESYS_EXPORTS;;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="2"
--- a/WincmdPacker/WincmdPacker.vcproj
+++ b/WincmdPacker/WincmdPacker.vcproj
@@ -17,9 +17,9 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
-			IntermediateDirectory="D:\Temp\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="$(TEMP)\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			InheritedPropertySheets="..\SLNKDWFProps.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -49,7 +49,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Wtl81\include;d:\Library\Dwf702\develop\global\src\dwf;d:\Library\Dwf702\develop\global\src\;.\CxImage\Zlib"
+				AdditionalIncludeDirectories="..\Wtl81\include;$(DWFTKPATH)\src\dwf;$(DWFTKPATH)\src\;.\CxImage\Zlib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FILESYS_EXPORTS;;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -116,9 +116,9 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
-			IntermediateDirectory="D:\Temp\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="$(TEMP)\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			InheritedPropertySheets="..\SLNKDWFProps.vsprops"
 			UseOfMFC="0"
 			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -148,7 +148,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Wtl81\include;d:\Library\Dwf702\develop\global\src\dwf;d:\Library\Dwf702\develop\global\src\;"
+				AdditionalIncludeDirectories="..\Wtl81\include;$(DWFTKPATH)\src\dwf;$(DWFTKPATH)\src\;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -219,7 +219,7 @@
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			InheritedPropertySheets="..\SLNKDWFProps.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -249,7 +249,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="d:\Library\Wtl80\include;d:\Library\Dwf702\develop\global\src\dwf;d:\Library\Dwf702\develop\global\src\;.\CxImage\Zlib"
+				AdditionalIncludeDirectories="d:\Library\Wtl80\include;$(DWFTKPATH)\src\dwf;$(DWFTKPATH)\src\;.\CxImage\Zlib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FILESYS_EXPORTS;;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="2"
--- a/WincmdViewer/WINCDMDWF.vcproj
+++ b/WincmdViewer/WINCDMDWF.vcproj
@@ -17,8 +17,9 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="D:\Temp\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="$(TEMP)\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="2"
+			InheritedPropertySheets="..\SLNKDWFProps.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -40,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm118"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Wtl81\include;d:\Library\Dwf702\develop\global\src\dwf;d:\Library\Dwf702\develop\global\src\"
+				AdditionalIncludeDirectories="..\Wtl81\include;$(DWFTKPATH)\src\dwf;$(DWFTKPATH)\src\"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="3"
 				TreatWChar_tAsBuiltInType="false"
@@ -95,8 +96,9 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="D:\Temp\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="$(TEMP)\Slnkdwf\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="2"
+			InheritedPropertySheets="..\SLNKDWFProps.vsprops"
 			UseOfATL="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			>
@@ -118,7 +120,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm118"
-				AdditionalIncludeDirectories="..\Wtl81\include;d:\Library\Dwf702\develop\global\src\dwf;d:\Library\Dwf702\develop\global\src\;.\CxImage\Zlib"
+				AdditionalIncludeDirectories="..\Wtl81\include;$(DWFTKPATH)\src\dwf;$(DWFTKPATH)\src\;.\CxImage\Zlib"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="2"
 				TreatWChar_tAsBuiltInType="false"
@@ -175,6 +177,7 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
+			InheritedPropertySheets="..\SLNKDWFProps.vsprops"
 			UseOfATL="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			>
@@ -196,7 +199,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm118"
-				AdditionalIncludeDirectories="d:\Library\Wtl80\include;d:\Library\Dwf702\develop\global\src\dwf;d:\Library\Dwf702\develop\global\src\;.\CxImage\Zlib"
+				AdditionalIncludeDirectories="d:\Library\Wtl80\include;$(DWFTKPATH)\src\dwf;$(DWFTKPATH)\src\;.\CxImage\Zlib"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="2"
 				TreatWChar_tAsBuiltInType="false"