From 74f70be81465af7b4ca68fb457929279fb03bab6 Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 21 Oct 2008 09:01:42 +0000
Subject: [PATCH] Patch level         : Files correlati     : Ricompilazione
 Demo : [ ] Commento            :

git-svn-id: svn://10.65.10.50/trunk@17435 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 projects/AgaLib.vcproj       |    8 +
 projects/agalib.sln          |   19 +-
 projects/agalib_alx.vcproj   |    6 +-
 projects/agalib_bagn.vcproj  |    6 +-
 projects/agalib_rep.vcproj   |    6 +-
 projects/crpa0.vcproj        |    8 +
 projects/lv0.vcproj          |  246 +--
 projects/lv2.vcproj          |   41 +-
 projects/mg_masktab.vcproj   |   11 +-
 projects/pdflib_dll.vcproj   | 3454 +++++-----------------------------
 projects/pdflibwrap.vcproj   |  193 ++
 projects/profiles.vcproj     |    6 +-
 projects/ve_maskrighe.vcproj |    5 +-
 projects/ve_masktab.vcproj   |    5 +-
 projects/xvaga.vcproj        |   98 -
 15 files changed, 907 insertions(+), 3205 deletions(-)
 create mode 100755 projects/pdflibwrap.vcproj

diff --git a/projects/AgaLib.vcproj b/projects/AgaLib.vcproj
index 145eacec9..32367e9f7 100755
--- a/projects/AgaLib.vcproj
+++ b/projects/AgaLib.vcproj
@@ -167,6 +167,10 @@
 			Name="Headers"
 			Filter="h"
 			>
+			<File
+				RelativePath="..\include\about.h"
+				>
+			</File>
 			<File
 				RelativePath="..\include\alex.h"
 				>
@@ -795,6 +799,10 @@
 		<Filter
 			Name="Sources"
 			>
+			<File
+				RelativePath="..\include\about.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\include\alex.cpp"
 				>
diff --git a/projects/agalib.sln b/projects/agalib.sln
index fa62f7ab9..a0b5f3a69 100755
--- a/projects/agalib.sln
+++ b/projects/agalib.sln
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcproj", "{2D38A763-3D74-4338-9362-B891784EC90E}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8B0477F1-5D74-46C3-97B6-8879E2460A71} = {8B0477F1-5D74-46C3-97B6-8879E2460A71}
-		{153C04B0-1F72-4DA9-8AC1-7DF76FFACFD2} = {153C04B0-1F72-4DA9-8AC1-7DF76FFACFD2}
-		{37C3DDAE-3A63-4C1C-A419-242141B262ED} = {37C3DDAE-3A63-4C1C-A419-242141B262ED}
-		{99683594-420F-4DD9-BB41-7DC48278B931} = {99683594-420F-4DD9-BB41-7DC48278B931}
-		{B612EC74-9275-43D1-9BE9-5BA942B67B3B} = {B612EC74-9275-43D1-9BE9-5BA942B67B3B}
-		{4A2FC619-2461-4F58-8F1D-92FA153E39A2} = {4A2FC619-2461-4F58-8F1D-92FA153E39A2}
 		{3A5B0119-6DAD-4407-9EE1-3B739B0581E8} = {3A5B0119-6DAD-4407-9EE1-3B739B0581E8}
+		{4A2FC619-2461-4F58-8F1D-92FA153E39A2} = {4A2FC619-2461-4F58-8F1D-92FA153E39A2}
+		{B612EC74-9275-43D1-9BE9-5BA942B67B3B} = {B612EC74-9275-43D1-9BE9-5BA942B67B3B}
+		{99683594-420F-4DD9-BB41-7DC48278B931} = {99683594-420F-4DD9-BB41-7DC48278B931}
+		{37C3DDAE-3A63-4C1C-A419-242141B262ED} = {37C3DDAE-3A63-4C1C-A419-242141B262ED}
+		{153C04B0-1F72-4DA9-8AC1-7DF76FFACFD2} = {153C04B0-1F72-4DA9-8AC1-7DF76FFACFD2}
+		{8B0477F1-5D74-46C3-97B6-8879E2460A71} = {8B0477F1-5D74-46C3-97B6-8879E2460A71}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sqlite", "SQLite.vcproj", "{B612EC74-9275-43D1-9BE9-5BA942B67B3B}"
@@ -35,6 +35,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xi", "xi.vcproj", "{3A5B011
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xvaga", "xvaga.vcproj", "{4A2FC619-2461-4F58-8F1D-92FA153E39A2}"
 	ProjectSection(ProjectDependencies) = postProject
+		{21876C3B-F5A9-4AAA-9D58-F8DDDAF6F10C} = {21876C3B-F5A9-4AAA-9D58-F8DDDAF6F10C}
 		{8B0477F1-5D74-46C3-97B6-8879E2460A71} = {8B0477F1-5D74-46C3-97B6-8879E2460A71}
 	EndProjectSection
 EndProject
@@ -44,6 +45,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xvapp", "xvapp.vcproj", "{1
 		{8B0477F1-5D74-46C3-97B6-8879E2460A71} = {8B0477F1-5D74-46C3-97B6-8879E2460A71}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdflibwrap", "pdflibwrap.vcproj", "{21876C3B-F5A9-4AAA-9D58-F8DDDAF6F10C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -98,6 +101,10 @@ Global
 		{153C04B0-1F72-4DA9-8AC1-7DF76FFACFD2}.Debug|Win32.Build.0 = Debug|Win32
 		{153C04B0-1F72-4DA9-8AC1-7DF76FFACFD2}.Release|Win32.ActiveCfg = Release|Win32
 		{153C04B0-1F72-4DA9-8AC1-7DF76FFACFD2}.Release|Win32.Build.0 = Release|Win32
+		{21876C3B-F5A9-4AAA-9D58-F8DDDAF6F10C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{21876C3B-F5A9-4AAA-9D58-F8DDDAF6F10C}.Debug|Win32.Build.0 = Debug|Win32
+		{21876C3B-F5A9-4AAA-9D58-F8DDDAF6F10C}.Release|Win32.ActiveCfg = Release|Win32
+		{21876C3B-F5A9-4AAA-9D58-F8DDDAF6F10C}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/projects/agalib_alx.vcproj b/projects/agalib_alx.vcproj
index 46bd31ac0..7e6c03022 100755
--- a/projects/agalib_alx.vcproj
+++ b/projects/agalib_alx.vcproj
@@ -73,9 +73,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile=".\../exed/agalib_alx.exe"
+				OutputFile=""
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
+				GenerateManifest="false"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\../exed/agalib_alx.pdb"
 				SubSystem="2"
@@ -166,9 +167,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="d:\release\campo100/agalib_alx.exe"
+				OutputFile=""
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
+				GenerateManifest="false"
 				ProgramDatabaseFile="..\Release/agalib_alx.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
diff --git a/projects/agalib_bagn.vcproj b/projects/agalib_bagn.vcproj
index 24aabb3f1..d67515076 100755
--- a/projects/agalib_bagn.vcproj
+++ b/projects/agalib_bagn.vcproj
@@ -73,9 +73,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="d:\release\campo100/agalib_bagn.exe"
+				OutputFile=""
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
+				GenerateManifest="false"
 				ProgramDatabaseFile="..\Release/agalib_bagn.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -165,9 +166,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile=".\../exed/agalib_bagn.exe"
+				OutputFile=""
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
+				GenerateManifest="false"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\../exed/agalib_bagn.pdb"
 				SubSystem="2"
diff --git a/projects/agalib_rep.vcproj b/projects/agalib_rep.vcproj
index 31eec78da..a3c88994a 100755
--- a/projects/agalib_rep.vcproj
+++ b/projects/agalib_rep.vcproj
@@ -73,9 +73,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile=".\..\exed/agalib_rep.exe"
+				OutputFile=""
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
+				GenerateManifest="false"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\..\exed/agalib_rep.pdb"
 				SubSystem="2"
@@ -166,9 +167,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="d:\release\campo100/agalib_rep.exe"
+				OutputFile=""
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
+				GenerateManifest="false"
 				ProgramDatabaseFile="..\Release/agalib_rep.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
diff --git a/projects/crpa0.vcproj b/projects/crpa0.vcproj
index ecc0048ac..c295277f6 100755
--- a/projects/crpa0.vcproj
+++ b/projects/crpa0.vcproj
@@ -258,6 +258,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\cg\cglib03.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\cg\cgsaldac.cpp"
 				>
@@ -402,6 +406,10 @@
 			Name="Header"
 			Filter="h"
 			>
+			<File
+				RelativePath="..\cg\cglib03.h"
+				>
+			</File>
 		</Filter>
 		<File
 			RelativePath="..\lib\AgaLib.lib"
diff --git a/projects/lv0.vcproj b/projects/lv0.vcproj
index 25972359a..48852319f 100755
--- a/projects/lv0.vcproj
+++ b/projects/lv0.vcproj
@@ -4,6 +4,7 @@
 	Version="9,00"
 	Name="lv0"
 	ProjectGUID="{2DB7F8EF-BABB-4A27-BC7D-8821B0D285C6}"
+	RootNamespace="lv0"
 	TargetFrameworkVersion="0"
 	>
 	<Platforms>
@@ -12,6 +13,9 @@
 		/>
 	</Platforms>
 	<ToolFiles>
+		<ToolFile
+			RelativePath=".\CampoRules.rules"
+		/>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
@@ -26,9 +30,18 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
+			<Tool
+				Name="RepCompiler"
+			/>
+			<Tool
+				Name="Mencompiler"
+			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
+			<Tool
+				Name="MskCompiler"
+			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
@@ -121,9 +134,18 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
+			<Tool
+				Name="RepCompiler"
+			/>
+			<Tool
+				Name="Mencompiler"
+			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
+			<Tool
+				Name="MskCompiler"
+			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
@@ -273,10 +295,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).msk"
+						Name="MskCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -297,10 +316,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).msk"
+						Name="MskCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -314,6 +330,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\lv\lv0400c.uml"
+				>
+			</File>
 			<File
 				RelativePath="..\lv\lv0500a.uml"
 				>
@@ -321,10 +341,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).msk"
+						Name="MskCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -338,6 +355,14 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\lv\lv0500c.uml"
+				>
+			</File>
+			<File
+				RelativePath="..\lv\lv0500d.uml"
+				>
+			</File>
 			<File
 				RelativePath="..\lv\lvstaut.uml"
 				>
@@ -345,10 +370,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
-						Outputs="$(TargetDir)$(InputName).msk"
+						Name="MskCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -357,7 +379,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
+						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
 						Outputs="$(TargetDir)$(InputName).msk"
 					/>
 				</FileConfiguration>
@@ -369,10 +391,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
-						Outputs="$(TargetDir)$(InputName).msk"
+						Name="MskCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -381,7 +400,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
+						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
 						Outputs="$(TargetDir)$(InputName).msk"
 					/>
 				</FileConfiguration>
@@ -393,10 +412,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
-						Outputs="$(TargetDir)$(InputName).msk"
+						Name="MskCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -405,7 +421,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
+						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
 						Outputs="$(TargetDir)$(InputName).msk"
 					/>
 				</FileConfiguration>
@@ -417,10 +433,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
-						Outputs="$(TargetDir)$(InputName).msk"
+						Name="MskCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -429,7 +442,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
+						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
 						Outputs="$(TargetDir)$(InputName).msk"
 					/>
 				</FileConfiguration>
@@ -441,10 +454,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
-						Outputs="$(TargetDir)$(InputName).msk"
+						Name="MskCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -453,7 +463,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
+						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
 						Outputs="$(TargetDir)$(InputName).msk"
 					/>
 				</FileConfiguration>
@@ -465,10 +475,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
-						Outputs="$(TargetDir)$(InputName).msk"
+						Name="MskCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -477,7 +484,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
+						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
 						Outputs="$(TargetDir)$(InputName).msk"
 					/>
 				</FileConfiguration>
@@ -489,10 +496,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
-						Outputs="$(TargetDir)$(InputName).msk"
+						Name="MskCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -501,7 +505,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
+						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
 						Outputs="$(TargetDir)$(InputName).msk"
 					/>
 				</FileConfiguration>
@@ -513,10 +517,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
-						Outputs="$(TargetDir)$(InputName).msk"
+						Name="MskCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -525,7 +526,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
+						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
 						Outputs="$(TargetDir)$(InputName).msk"
 					/>
 				</FileConfiguration>
@@ -537,10 +538,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
-						Outputs="$(TargetDir)$(InputName).msk"
+						Name="MskCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -549,7 +547,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
+						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
 						Outputs="$(TargetDir)$(InputName).msk"
 					/>
 				</FileConfiguration>
@@ -561,10 +559,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).msk"
+						Name="MskCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -585,10 +580,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).msk"
+						Name="MskCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -609,10 +601,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).msk"
+						Name="MskCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -633,10 +622,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).msk"
+						Name="MskCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -657,10 +643,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).msk"
+						Name="MskCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -681,10 +664,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).msk"
+						Name="MskCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -705,10 +685,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).msk"
+						Name="MskCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -729,10 +706,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).msk"
+						Name="MskCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -753,10 +727,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).msk"
+						Name="MskCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -777,10 +748,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName).msk"
+						Name="MskCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1197,10 +1165,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying men $(InputName)..."
-						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).men&#x0D;&#x0A;"
-						Outputs="$(TargetDir)\$(InputName).men"
+						Name="Mencompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1224,6 +1189,22 @@
 			Name="Rep"
 			Filter="rep"
 			>
+			<File
+				RelativePath="..\lv\lv0400c.rep"
+				>
+			</File>
+			<File
+				RelativePath="..\lv\lv0500c.rep"
+				>
+			</File>
+			<File
+				RelativePath="..\lv\lv0500d.rep"
+				>
+			</File>
+			<File
+				RelativePath="..\lv\lv2300a.rep"
+				>
+			</File>
 			<File
 				RelativePath="..\lv\lvstaut.rep"
 				>
@@ -1231,10 +1212,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying rep $(InputName)..."
-						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep"
-						Outputs="$(TargetDir)\$(InputName).rep"
+						Name="RepCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1243,7 +1221,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying rep $(InputName)..."
-						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep"
+						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep&#x0D;&#x0A;"
 						Outputs="$(TargetDir)\$(InputName).rep"
 					/>
 				</FileConfiguration>
@@ -1255,10 +1233,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying rep $(InputName)..."
-						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep"
-						Outputs="$(TargetDir)\$(InputName).rep"
+						Name="RepCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1267,7 +1242,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying rep $(InputName)..."
-						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep"
+						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep&#x0D;&#x0A;"
 						Outputs="$(TargetDir)\$(InputName).rep"
 					/>
 				</FileConfiguration>
@@ -1279,10 +1254,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying rep $(InputName)..."
-						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep"
-						Outputs="$(TargetDir)\$(InputName).rep"
+						Name="RepCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1291,7 +1263,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying rep $(InputName)..."
-						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep"
+						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep&#x0D;&#x0A;"
 						Outputs="$(TargetDir)\$(InputName).rep"
 					/>
 				</FileConfiguration>
@@ -1303,10 +1275,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying rep $(InputName)..."
-						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep"
-						Outputs="$(TargetDir)\$(InputName).rep"
+						Name="RepCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1315,7 +1284,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying rep $(InputName)..."
-						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep"
+						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep&#x0D;&#x0A;"
 						Outputs="$(TargetDir)\$(InputName).rep"
 					/>
 				</FileConfiguration>
@@ -1327,10 +1296,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying rep $(InputName)..."
-						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep"
-						Outputs="$(TargetDir)\$(InputName).rep"
+						Name="RepCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1339,7 +1305,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying rep $(InputName)..."
-						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep"
+						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep&#x0D;&#x0A;"
 						Outputs="$(TargetDir)\$(InputName).rep"
 					/>
 				</FileConfiguration>
@@ -1351,10 +1317,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying rep $(InputName)..."
-						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep"
-						Outputs="$(TargetDir)\$(InputName).rep"
+						Name="RepCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1363,7 +1326,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying rep $(InputName)..."
-						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep"
+						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep&#x0D;&#x0A;"
 						Outputs="$(TargetDir)\$(InputName).rep"
 					/>
 				</FileConfiguration>
@@ -1375,10 +1338,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying rep $(InputName)..."
-						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep"
-						Outputs="$(TargetDir)\$(InputName).rep"
+						Name="RepCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1387,7 +1347,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying rep $(InputName)..."
-						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep"
+						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep&#x0D;&#x0A;"
 						Outputs="$(TargetDir)\$(InputName).rep"
 					/>
 				</FileConfiguration>
@@ -1399,10 +1359,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying rep $(InputName)..."
-						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep"
-						Outputs="$(TargetDir)\$(InputName).rep"
+						Name="RepCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1411,7 +1368,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying rep $(InputName)..."
-						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep"
+						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep&#x0D;&#x0A;"
 						Outputs="$(TargetDir)\$(InputName).rep"
 					/>
 				</FileConfiguration>
@@ -1423,10 +1380,7 @@
 					Name="Release|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying rep $(InputName)..."
-						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep"
-						Outputs="$(TargetDir)\$(InputName).rep"
+						Name="RepCompiler"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1435,7 +1389,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying rep $(InputName)..."
-						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep"
+						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep&#x0D;&#x0A;"
 						Outputs="$(TargetDir)\$(InputName).rep"
 					/>
 				</FileConfiguration>
diff --git a/projects/lv2.vcproj b/projects/lv2.vcproj
index 0326fab07..a2918c448 100755
--- a/projects/lv2.vcproj
+++ b/projects/lv2.vcproj
@@ -12,6 +12,9 @@
 		/>
 	</Platforms>
 	<ToolFiles>
+		<ToolFile
+			RelativePath=".\CampoRules.rules"
+		/>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
@@ -26,9 +29,18 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
+			<Tool
+				Name="RepCompiler"
+			/>
+			<Tool
+				Name="Mencompiler"
+			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
+			<Tool
+				Name="MskCompiler"
+			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
@@ -121,9 +133,18 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
+			<Tool
+				Name="RepCompiler"
+			/>
+			<Tool
+				Name="Mencompiler"
+			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
+			<Tool
+				Name="MskCompiler"
+			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
@@ -229,6 +250,10 @@
 				RelativePath="..\lv\lv2300.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\lv\lv2400.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\lv\lvlib.cpp"
 				>
@@ -295,7 +320,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
+						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
 						Outputs="$(TargetDir)$(InputName).msk"
 					/>
 				</FileConfiguration>
@@ -305,11 +330,15 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
+						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
 						Outputs="$(TargetDir)$(InputName).msk"
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\lv\lv2400a.uml"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Headers"
@@ -331,6 +360,10 @@
 				RelativePath="..\lv\lv2300a.h"
 				>
 			</File>
+			<File
+				RelativePath="..\lv\lv2400a.h"
+				>
+			</File>
 			<File
 				RelativePath="..\lv\lvcondv.h"
 				>
@@ -366,7 +399,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying rep $(InputName)..."
-						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep"
+						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep&#x0D;&#x0A;"
 						Outputs="$(TargetDir)\$(InputName).rep"
 					/>
 				</FileConfiguration>
@@ -376,7 +409,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying rep $(InputName)..."
-						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep"
+						CommandLine="copy $(InputPath) $(TargetDir)\$(InputName).rep&#x0D;&#x0A;"
 						Outputs="$(TargetDir)\$(InputName).rep"
 					/>
 				</FileConfiguration>
diff --git a/projects/mg_masktab.vcproj b/projects/mg_masktab.vcproj
index 68bc0043a..2a716fd28 100755
--- a/projects/mg_masktab.vcproj
+++ b/projects/mg_masktab.vcproj
@@ -165,7 +165,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile=".\..\exed/mg_masktab.exe"
+				OutputFile=""
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
@@ -180,6 +180,7 @@
 			/>
 			<Tool
 				Name="VCManifestTool"
+				SuppressStartupBanner="false"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
@@ -432,7 +433,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
+						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
 						Outputs="$(TargetDir)$(InputName).msk"
 					/>
 				</FileConfiguration>
@@ -442,7 +443,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
+						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
 						Outputs="$(TargetDir)$(InputName).msk"
 					/>
 				</FileConfiguration>
@@ -504,7 +505,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
+						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
 						Outputs="$(TargetDir)$(InputName).msk"
 					/>
 				</FileConfiguration>
@@ -514,7 +515,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Compiling mask $(InputPath)..."
-						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
+						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
 						Outputs="$(TargetDir)$(InputName).msk"
 					/>
 				</FileConfiguration>
diff --git a/projects/pdflib_dll.vcproj b/projects/pdflib_dll.vcproj
index 4e890d0c7..ef372a35a 100755
--- a/projects/pdflib_dll.vcproj
+++ b/projects/pdflib_dll.vcproj
@@ -49,7 +49,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../pdf/flate,../pdf/tiff,../pdf/jpeg,../pdf/png,../pdf/pdcore"
+				AdditionalIncludeDirectories="../pdf/flate,../pdf/tiff,../pdf/jpeg,../pdf/png,../pdf/pdcore,../pdf/font"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MT;PDFLIB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -145,7 +145,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../pdf/flate,../pdf/tiff,../pdf/jpeg,../pdf/png,../pdf/pdcore"
+				AdditionalIncludeDirectories="../pdf/flate,../pdf/tiff,../pdf/jpeg,../pdf/png,../pdf/pdcore,../pdf/font"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_MT;PDFLIB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -211,250 +211,52 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
-			<File
-				RelativePath="..\pdf\pdflib\pdflib.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
 			<Filter
 				Name="png"
 				>
 				<File
 					RelativePath="..\pdf\png\png.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\png\pngerror.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\png\pngget.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\png\pngmem.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\png\pngread.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\png\pngrio.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\png\pngrtran.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\png\pngrutil.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\png\pngset.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\png\pngtrans.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\pdf\png\pngvcrd.c"
+					>
 				</File>
 			</Filter>
 			<Filter
@@ -463,2012 +265,442 @@
 				<File
 					RelativePath="..\pdf\tiff\tif_auxx.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_close.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_codec.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_color.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_compress.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_dir.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_dirinfo.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_dirread.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\pdf\tiff\tif_dirwrite.c"
+					>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_dumpmode.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_error.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\pdf\tiff\tif_extension.c"
+					>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_fax3.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_fax3sm.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\pdf\tiff\tif_flush.c"
+					>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_getimage.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_jpeg.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_luv.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_lzw.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_next.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_ojpeg.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_open.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_packbits.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\pdf\tiff\tif_pixarlog.c"
+					>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_predict.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\pdf\tiff\tif_print.c"
+					>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_read.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_strip.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_swab.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\pdf\tiff\tif_thunder.c"
+					>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_tile.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_unix.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_version.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_warning.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\pdf\tiff\tif_write.c"
+					>
 				</File>
 				<File
 					RelativePath="..\pdf\tiff\tif_zip.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 			</Filter>
 			<Filter
 				Name="pdf"
 				>
+				<File
+					RelativePath="..\pdf\pdflib\p_3d.c"
+					>
+				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_actions.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_afm.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_annots.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_block.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_bmp.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_ccitt.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_cid.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_color.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_document.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_draw.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_encoding.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_fields.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_filter.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_font.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_gif.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_gstate.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\pdf\pdflib\p_hostfont.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_hyper.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_icc.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_icclib.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_image.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_jpeg.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_jpx.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_kerning.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_layer.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\pdf\pdflib\p_mbox.c"
+					>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_object.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_opi.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_page.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_params.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_pattern.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_pdi.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_pfm.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\pdf\pdflib\p_photoshp.c"
+					>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_png.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\pdf\pdflib\p_resource.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_shading.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_subsett.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\pdf\pdflib\p_table.c"
+					>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_tagged.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_template.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_text.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_textflow.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_tiff.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_truetype.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_type1.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_type3.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_util.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdflib\p_xgstate.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\pdf\pdflib\p_xmp.c"
+					>
 				</File>
 			</Filter>
 			<Filter
 				Name="pdcore"
 				>
+				<File
+					RelativePath="..\pdf\pdcore\pc_aes.c"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_aescbc.c"
+					>
+				</File>
 				<File
 					RelativePath="..\pdf\pdcore\pc_arc4.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_chartabs.c"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_contain.c"
+					>
 				</File>
 				<File
 					RelativePath="..\pdf\pdcore\pc_core.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\pdf\pdcore\pc_corefont.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdcore\pc_crypt.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_ctype.c"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_digsig.c"
+					>
 				</File>
 				<File
 					RelativePath="..\pdf\pdcore\pc_ebcdic.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdcore\pc_encoding.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdcore\pc_file.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\pdf\pdcore\pc_font.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdcore\pc_geom.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdcore\pc_md5.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdcore\pc_optparse.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdcore\pc_output.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\pdf\pdcore\pc_sbuf.c"
+					RelativePath="..\pdf\pdcore\pc_resource.c"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_scan.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdcore\pc_scope.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_string.c"
+					>
 				</File>
 				<File
 					RelativePath="..\pdf\pdcore\pc_unicode.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\pdcore\pc_util.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_xmp.c"
+					>
 				</File>
 			</Filter>
 			<Filter
@@ -2477,1014 +709,186 @@
 				<File
 					RelativePath="..\pdf\jpeg\jcapimin.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jcapistd.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jccoefct.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jccolor.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jcdctmgr.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jchuff.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jcinit.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jcmainct.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jcmarker.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jcmaster.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jcomapi.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jcparam.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jcphuff.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jcprepct.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jcsample.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jctrans.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jdapimin.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jdapistd.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jdatadst.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jdatasrc.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jdcoefct.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jdcolor.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jddctmgr.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jdhuff.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jdinput.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jdmainct.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jdmarker.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jdmaster.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jdmerge.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jdphuff.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jdpostct.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jdsample.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jdtrans.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jerror.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jfdctflt.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jfdctfst.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jfdctint.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jidctflt.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jidctfst.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jidctint.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jidctred.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jmemmgr.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jmemnobs.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jquant1.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jquant2.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\jpeg\jutils.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 			</Filter>
 			<Filter
@@ -3493,288 +897,74 @@
 				<File
 					RelativePath="..\pdf\flate\adler32.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\flate\compress.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\flate\crc32.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\flate\deflate.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\pdf\flate\infblock.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\pdf\flate\infcodes.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\flate\inffast.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\flate\inflate.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\flate\inftrees.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\pdf\flate\infutil.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\flate\trees.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\flate\uncompr.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\pdf\flate\zutil.c"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
+				</File>
+			</Filter>
+			<Filter
+				Name="font"
+				>
+				<File
+					RelativePath="..\pdf\font\ft_cid.c"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\font\ft_corefont.c"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\font\ft_font.c"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\font\ft_hostfont.c"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\font\ft_pdffont.c"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\font\ft_truetype.c"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\font\ft_type1.c"
+					>
 				</File>
 			</Filter>
 		</Filter>
@@ -3800,24 +990,44 @@
 			Filter="*.h"
 			>
 			<Filter
-				Name="jpegh"
+				Name="jpeg"
 				>
 				<File
 					RelativePath="jchuff.h"
 					>
 				</File>
+				<File
+					RelativePath="..\pdf\jpeg\jchuff.h"
+					>
+				</File>
 				<File
 					RelativePath="jconfig.h"
 					>
 				</File>
+				<File
+					RelativePath="..\pdf\jpeg\jconfig.h"
+					>
+				</File>
 				<File
 					RelativePath="jdct.h"
 					>
 				</File>
+				<File
+					RelativePath="..\pdf\jpeg\jdct.h"
+					>
+				</File>
 				<File
 					RelativePath="jdhuff.h"
 					>
 				</File>
+				<File
+					RelativePath="..\pdf\jpeg\jdhuff.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\jpeg\jerror.h"
+					>
+				</File>
 				<File
 					RelativePath="jerror.h"
 					>
@@ -3826,10 +1036,22 @@
 					RelativePath="jinclude.h"
 					>
 				</File>
+				<File
+					RelativePath="..\pdf\jpeg\jinclude.h"
+					>
+				</File>
 				<File
 					RelativePath="jmemsys.h"
 					>
 				</File>
+				<File
+					RelativePath="..\pdf\jpeg\jmemsys.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\jpeg\jmorecfg.h"
+					>
+				</File>
 				<File
 					RelativePath="jmorecfg.h"
 					>
@@ -3838,15 +1060,379 @@
 					RelativePath="jpegint.h"
 					>
 				</File>
+				<File
+					RelativePath="..\pdf\jpeg\jpegint.h"
+					>
+				</File>
 				<File
 					RelativePath="jpeglib.h"
 					>
 				</File>
+				<File
+					RelativePath="..\pdf\jpeg\jpeglib.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\jpeg\jversion.h"
+					>
+				</File>
 				<File
 					RelativePath="jversion.h"
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="flate"
+				>
+				<File
+					RelativePath="..\pdf\flate\crc32.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\flate\deflate.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\flate\inffast.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\flate\inffixed.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\flate\inflate.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\flate\inftrees.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\flate\trees.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\flate\zconf.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\flate\zlib.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\flate\zprefix.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\flate\zutil.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="font"
+				>
+				<File
+					RelativePath="..\pdf\font\ft_cid.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\font\ft_corefont.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\font\ft_font.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\font\ft_generr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\font\ft_pdffont.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\font\ft_truetype.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="pdcore"
+				>
+				<File
+					RelativePath="..\pdf\pdcore\pc_aes.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_aeslocal.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_arc4.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_chartabs.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_classic.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_config.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_contain.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_core.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_crypt.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_ctype.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_digsig.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_ebcdic.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_encoding.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_exports.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_file.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_generr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_geom.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_md5.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_optparse.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_output.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_prefix.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_pstok.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_resource.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_scan.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_scantok.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_scope.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_strconst.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_string.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_unicode.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_util.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdcore\pc_xmp.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="pdf"
+				>
+				<File
+					RelativePath="..\pdf\pdflib\p_color.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdflib\p_defopt.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdflib\p_font.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdflib\p_generr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdflib\p_hkscmyk.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdflib\p_hkslab.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdflib\p_icc.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdflib\p_icc9809.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdflib\p_icclib.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdflib\p_image.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdflib\p_intern.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdflib\p_keyconn.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdflib\p_layer.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdflib\p_page.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdflib\p_pantlab.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdflib\p_params.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdflib\p_tagged.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdflib\pdflib.c"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdflib\pdflib.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\pdflib\resource.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="png"
+				>
+				<File
+					RelativePath="..\pdf\png\png.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\png\pngconf.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\png\pngusr.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="tiff"
+				>
+				<File
+					RelativePath="..\pdf\tiff\port.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\tiff\t4.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\tiff\tif_dir.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\tiff\tif_fax3.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\tiff\tif_predict.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\tiff\tiff.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\tiff\tiffconf.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\tiff\tiffio.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\tiff\tiffiop.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\tiff\tiffvers.h"
+					>
+				</File>
+				<File
+					RelativePath="..\pdf\tiff\uvcode.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/projects/pdflibwrap.vcproj b/projects/pdflibwrap.vcproj
new file mode 100755
index 000000000..8298e2276
--- /dev/null
+++ b/projects/pdflibwrap.vcproj
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="pdflibwrap"
+	ProjectGUID="{21876C3B-F5A9-4AAA-9D58-F8DDDAF6F10C}"
+	RootNamespace="pdflibwrap"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\..\lib"
+			IntermediateDirectory=".\..\Debug\DebugPdflibwrap"
+			ConfigurationType="4"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="C:\U\luca\wx287\lib\vc_dll\mswd;C:\U\luca\wx287\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\../lib"
+			IntermediateDirectory=".\../Release/ReleasePdflibwrap"
+			ConfigurationType="4"
+			CharacterSet="0"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="C:\U\luca\wx287\lib\vc_dll\msw;C:\U\luca\wx287\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\pdf\pdflib\pdflibdl.c"
+				>
+			</File>
+			<File
+				RelativePath="..\xvaga\XFont.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\xvaga\xvtpdf.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\pdf\pdflib\pdflibdl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\xvaga\XFont.h"
+				>
+			</File>
+			<File
+				RelativePath="..\xvaga\xvtpdf.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/projects/profiles.vcproj b/projects/profiles.vcproj
index 4e0122471..983d2f809 100755
--- a/projects/profiles.vcproj
+++ b/projects/profiles.vcproj
@@ -73,9 +73,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="d:\release\campo100/profiles.exe"
+				OutputFile=""
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
+				GenerateManifest="false"
 				ProgramDatabaseFile=".\..\release/profiles.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -165,7 +166,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile=".\..\exed/profiles.exe"
+				OutputFile=""
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
@@ -180,6 +181,7 @@
 			/>
 			<Tool
 				Name="VCManifestTool"
+				SuppressStartupBanner="false"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
diff --git a/projects/ve_maskrighe.vcproj b/projects/ve_maskrighe.vcproj
index 3a361fc16..246e356aa 100755
--- a/projects/ve_maskrighe.vcproj
+++ b/projects/ve_maskrighe.vcproj
@@ -73,9 +73,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="d:\release\campo100/ve_maskrighe.exe"
+				OutputFile=""
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
+				GenerateManifest="false"
 				ProgramDatabaseFile=".\..\release/ve_maskrighe.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -165,7 +166,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile=".\..\exed/ve_maskrighe.exe"
+				OutputFile=""
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
diff --git a/projects/ve_masktab.vcproj b/projects/ve_masktab.vcproj
index 2df255e73..61510cc90 100755
--- a/projects/ve_masktab.vcproj
+++ b/projects/ve_masktab.vcproj
@@ -73,7 +73,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile=".\..\exed/ve_masktab.exe"
+				OutputFile=""
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
@@ -166,9 +166,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="d:\release\campo100/ve_masktab.exe"
+				OutputFile=""
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
+				GenerateManifest="false"
 				ProgramDatabaseFile=".\..\release/ve_masktab.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
diff --git a/projects/xvaga.vcproj b/projects/xvaga.vcproj
index dd8930518..1a649e8b3 100755
--- a/projects/xvaga.vcproj
+++ b/projects/xvaga.vcproj
@@ -289,54 +289,10 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\pdf\pdflib\pdflibdl.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\xvaga\smapi.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\xvaga\XFont.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\xvaga\xvaga.cpp"
 				>
@@ -411,28 +367,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\xvaga\xvtpdf.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\xvaga\xvtwin.cpp"
 				>
@@ -502,10 +436,6 @@
 				RelativePath="..\xvaga\wxinc.h"
 				>
 			</File>
-			<File
-				RelativePath="..\xvaga\XFont.h"
-				>
-			</File>
 			<File
 				RelativePath="..\xvaga\XTrace.h"
 				>
@@ -542,10 +472,6 @@
 				RelativePath="..\xvaga\xvtextra.h"
 				>
 			</File>
-			<File
-				RelativePath="..\xvaga\xvtpdf.h"
-				>
-			</File>
 			<File
 				RelativePath="..\xvaga\xvtwin.h"
 				>
@@ -560,30 +486,6 @@
 			RelativePath="..\lib\hlw32_mc.lib"
 			>
 		</File>
-		<File
-			RelativePath="..\lib\pdflib.lib"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				ExcludedFromBuild="true"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\lib\pdflibd.lib"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				ExcludedFromBuild="true"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-				/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath="..\Lib\Skeylink.obj"
 			>