--- parser3/src/main/main.vcproj	2009/07/04 08:10:53	1.26
+++ parser3/src/main/main.vcproj	2019/12/07 23:31:48	1.35
@@ -3,6 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="main"
+	ProjectGUID="{650C3584-6F31-4CDE-9A4E-42BAAD4EA88E}"
 	SccProjectName="main"
 	SccAuxPath=""
 	SccLocalPath=".."
@@ -26,7 +27,7 @@
 				GlobalOptimizations="TRUE"
 				InlineFunctionExpansion="1"
 				OptimizeForWindowsApplication="TRUE"
-				AdditionalIncludeDirectories="..\lib\ltdl;..\classes\gd;..\include;..\types;..\classes;..\lib\gc\include;..\lib\cord\include;..\..\..\win32\pcre;..\sql;..\..\..\win32\gnome\libxml2-x.x.x\win32\release\include;..\..\..\win32\gnome\libxslt-x.x.x\win32\release\include"
+				AdditionalIncludeDirectories="..\lib\ltdl;..\classes\gd;..\include;..\types;..\classes;..\lib\punycode;..\..\..\win32\pcre;..\sql;..\..\..\win32\gnome\libxml2-x.x.x\win32\release\include\libxml2;..\..\..\win32\gnome\libxml2-x.x.x\win32\release\include;..\..\..\win32\gnome\libxslt-x.x.x\win32\release\include"
 				PreprocessorDefinitions="NDEBUG;_LIB;WIN32"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -44,7 +45,6 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalDependencies="..\..\..\win32\pcre\Release\pcre.lib"
 				OutputFile=".\Release\main.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
@@ -78,7 +78,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\lib\ltdl;..\classes\gd;..\include;..\types;..\classes;..\lib\gc\include;..\lib\cord\include;..\..\..\win32\pcre;..\sql;..\..\..\win32\gnome\libxml2-x.x.x\win32\debug\include;..\..\..\win32\gnome\libxslt-x.x.x\win32\debug\include"
+				AdditionalIncludeDirectories="..\lib\ltdl;..\classes\gd;..\include;..\types;..\classes;..\lib\punycode;..\..\..\win32\pcre;..\sql;..\..\..\win32\gnome\libxml2-x.x.x\win32\debug\include\libxml2;..\..\..\win32\gnome\libxml2-x.x.x\win32\debug\include;..\..\..\win32\gnome\libxslt-x.x.x\win32\debug\include"
 				PreprocessorDefinitions="_DEBUG;_LIB;WIN32"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -96,7 +96,6 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalDependencies="..\..\..\win32\pcre\Debug\pcre.lib"
 				OutputFile=".\Debug\main.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
@@ -140,23 +139,24 @@
 		<File
 			RelativePath="compile.y">
 			<FileConfiguration
-				Name="Release|Win32">
+				Name="Release|Win32"
+				ExcludedFromBuild="TRUE">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Compiling grammar..."
 					CommandLine="cd &quot;$(InputDir)&quot;
-set BISON_SIMPLE=..\..\..\win32\tools\usr\share\bison.simple
-..\..\..\win32\tools\bison -v &quot;$(InputName)&quot;.y -o compile.tab.C
+..\..\..\win32\tools\cygwin\bin\bison -v &quot;$(InputName)&quot;.y -o compile.tab.C -Syacc.c
 "
 					Outputs="compile.tab.C"/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				ExcludedFromBuild="TRUE">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Compiling grammar..."
 					CommandLine="cd &quot;$(InputDir)&quot;
-..\..\..\win32\tools\bison -v &quot;$(InputName)&quot;.y -o compile.tab.C -S/../../../cygdrive/y/parser3project/win32/tools/yacc.c
+..\..\..\win32\tools\cygwin\bin\bison -v &quot;$(InputName)&quot;.y -o compile.tab.C -Syacc.c
 "
 					Outputs="compile.tab.C"/>
 			</FileConfiguration>
@@ -198,6 +198,12 @@ set BISON_SIMPLE=..\..\..\win32\tools\us
 			RelativePath="..\include\pa_common.h">
 		</File>
 		<File
+			RelativePath=".\pa_base64.C">
+		</File>
+		<File
+			RelativePath="..\include\pa_base64.h">
+		</File>
+		<File
 			RelativePath="..\include\pa_config_fixed.h">
 		</File>
 		<File
@@ -324,6 +330,12 @@ set BISON_SIMPLE=..\..\..\win32\tools\us
 			RelativePath="..\include\pa_stylesheet_manager.h">
 		</File>
 		<File
+			RelativePath=".\pa_symbols.C">
+		</File>
+		<File
+			RelativePath="..\include\pa_symbols.h">
+		</File>
+		<File
 			RelativePath=".\pa_table.C">
 		</File>
 		<File