From a71f6edd591038828e9552d758e2a5378e399f41 Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor.andersson@artifex.com>
Date: Thu, 7 Jun 2018 14:01:37 +0200
Subject: Use bin2coff to generate font data blobs object files.

This is the windows equivalent of objcopy or ld -r binary.

We need different bin2coff font object files for 32 and 64 bit builds,
so put the font object files in AdditionalDependencies.

Revamp Windows builds to use bin2coff.

Fix bin2coff to not use '-' in symbol names.

Add a new project file to make bin2coff.

Add a .rules file to tell MSVC how to call the built version of bin2coff.

Update libresources build to use this rules file.

Update noto.c to correctly find the symbols we make.
---
 platform/win32/bin2coff.rules      |   52 ++
 platform/win32/bin2coff.vcproj     |  104 +++
 platform/win32/dummy.c             |    6 +
 platform/win32/generated.vcproj    |   81 ---
 platform/win32/libresources.vcproj | 1219 +++++++++++++++++++-----------------
 platform/win32/mupdf.sln           |  122 ++--
 6 files changed, 845 insertions(+), 739 deletions(-)
 create mode 100644 platform/win32/bin2coff.rules
 create mode 100644 platform/win32/bin2coff.vcproj
 create mode 100644 platform/win32/dummy.c
 delete mode 100644 platform/win32/generated.vcproj

(limited to 'platform/win32')

diff --git a/platform/win32/bin2coff.rules b/platform/win32/bin2coff.rules
new file mode 100644
index 00000000..d2ae45a3
--- /dev/null
+++ b/platform/win32/bin2coff.rules
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<VisualStudioToolFile
+	Name="bin2coff"
+	Version="8.00"
+	>
+	<Rules>
+		<CustomBuildRule
+			Name="bin2coff (ttf)"
+			DisplayName="bin2coff (ttf)"
+			CommandLine="Release\bin2coff.exe $(InputPath) Release\libresources\$(InputName)_ttf.obj _binary_resources_fonts_$(InputName)_ttf&#x0D;&#x0A;Release\bin2coff.exe $(InputPath) x64\Release\libresources\$(InputName)_ttf.obj _binary_resources_fonts_$(InputName)_ttf 64bit&#x0D;&#x0A;&#x0D;&#x0A;"
+			Outputs="$(IntDir)\$(InputName)_ttf.obj"
+			FileExtensions="*.ttf"
+			ExecutionDescription="Embedding TTF"
+			>
+			<Properties>
+			</Properties>
+		</CustomBuildRule>
+		<CustomBuildRule
+			Name="bin2coff (otf)"
+			DisplayName="bin2coff (otf)"
+			CommandLine="Release\bin2coff.exe $(InputPath) Release\libresources\$(InputName)_otf.obj _binary_resources_fonts_$(InputName)_otf&#x0D;&#x0A;Release\bin2coff.exe $(InputPath) x64\Release\libresources\$(InputName)_otf.obj _binary_resources_fonts_$(InputName)_otf 64bit&#x0D;&#x0A;&#x0D;&#x0A;&#x0D;&#x0A;"
+			Outputs="$(IntDir)\$(InputName)_otf.obj"
+			FileExtensions="*.otf"
+			ExecutionDescription="Embedding OTF"
+			>
+			<Properties>
+			</Properties>
+		</CustomBuildRule>
+		<CustomBuildRule
+			Name="bin2coff (cff)"
+			DisplayName="bin2coff (cff)"
+			CommandLine="Release\bin2coff.exe $(InputPath) Release\libresources\$(InputName)_cff.obj _binary_resources_fonts_$(InputName)_cff&#x0D;&#x0A;Release\bin2coff.exe $(InputPath) x64\Release\libresources\$(InputName)_cff.obj _binary_resources_fonts_$(InputName)_cff 64bit&#x0D;&#x0A;&#x0D;&#x0A;&#x0D;&#x0A;"
+			Outputs="$(IntDir)\$(InputName)_cff.obj"
+			FileExtensions="*.cff"
+			ExecutionDescription="Embedding CFF"
+			>
+			<Properties>
+			</Properties>
+		</CustomBuildRule>
+		<CustomBuildRule
+			Name="bin2coff (ttc)"
+			DisplayName="bin2coff (ttc)"
+			CommandLine="Release\bin2coff.exe $(InputPath) Release\libresources\$(InputName)_ttc.obj _binary_resources_fonts_$(InputName)_ttc&#x0D;&#x0A;Release\bin2coff.exe $(InputPath) x64\Release\libresources\$(InputName)_ttc.obj _binary_resources_fonts_$(InputName)_ttc 64bit&#x0D;&#x0A;&#x0D;&#x0A;&#x0D;&#x0A;"
+			Outputs="$(IntDir)\$(InputName)_ttc.obj"
+			FileExtensions="*.ttc"
+			ExecutionDescription="Embedding TTC"
+			>
+			<Properties>
+			</Properties>
+		</CustomBuildRule>
+	</Rules>
+</VisualStudioToolFile>
diff --git a/platform/win32/bin2coff.vcproj b/platform/win32/bin2coff.vcproj
new file mode 100644
index 00000000..badcde97
--- /dev/null
+++ b/platform/win32/bin2coff.vcproj
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="bin2coff"
+	ProjectGUID="{BFE316B3-BD90-433A-A20D-C73975F1CAA7}"
+	RootNamespace="bin2coff"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\scripts\bin2coff.c"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/platform/win32/dummy.c b/platform/win32/dummy.c
new file mode 100644
index 00000000..aa7866e7
--- /dev/null
+++ b/platform/win32/dummy.c
@@ -0,0 +1,6 @@
+/* We put the font object files in the 'AdditionalDependencies' list,
+ * but we need at least one C file to link the library.
+ * Since we need different object files for 32 and 64 bit builds,
+ * we can't just include them in the file list.
+ */
+int libresources_dummy;
diff --git a/platform/win32/generated.vcproj b/platform/win32/generated.vcproj
deleted file mode 100644
index 07f892a0..00000000
--- a/platform/win32/generated.vcproj
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="generated"
-	ProjectGUID="{A5053AA7-02E5-4903-B596-04F17AEB1526}"
-	RootNamespace="generated"
-	Keyword="MakeFileProj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="0"
-			>
-			<Tool
-				Name="VCNMakeTool"
-				BuildCommandLine="cd ..\.. &amp;&amp; nmake /nologo -f scripts\fontdump.nmake"
-				ReBuildCommandLine="cd ..\.. &amp;&amp; del /q /s generated\resources &amp;&amp;  nmake /nologo -f scripts\fontdump.nmake"
-				CleanCommandLine="cd ..\.. &amp;&amp; del /q /s generated\resources"
-				Output=""
-				PreprocessorDefinitions="WIN32;_DEBUG"
-				IncludeSearchPath=""
-				ForcedIncludes=""
-				AssemblySearchPath=""
-				ForcedUsingAssemblies=""
-				CompileAsManaged=""
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="scripts"
-			>
-			<File
-				RelativePath="..\..\scripts\cmapdump.py"
-				>
-			</File>
-			<File
-				RelativePath="..\..\scripts\fontdump.nmake"
-				>
-			</File>
-			<File
-				RelativePath="..\..\scripts\hexdump.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\scripts\jsdump.sed"
-				>
-			</File>
-			<File
-				RelativePath="..\..\scripts\runcmapdump.sh"
-				>
-			</File>
-			<File
-				RelativePath="..\..\scripts\runfontdump.sh"
-				>
-			</File>
-			<File
-				RelativePath="..\..\scripts\runiccdump.sh"
-				>
-			</File>
-			<File
-				RelativePath="..\..\scripts\runjsdump.sh"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/platform/win32/libresources.vcproj b/platform/win32/libresources.vcproj
index bdaa820c..f28a51a7 100644
--- a/platform/win32/libresources.vcproj
+++ b/platform/win32/libresources.vcproj
@@ -15,6 +15,9 @@
 		/>
 	</Platforms>
 	<ToolFiles>
+		<ToolFile
+			RelativePath=".\bin2coff.rules"
+		/>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
@@ -28,9 +31,21 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
+			<Tool
+				Name="bin2coff (cff)"
+			/>
+			<Tool
+				Name="bin2coff (ttc)"
+			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
+			<Tool
+				Name="bin2coff (otf)"
+			/>
+			<Tool
+				Name="bin2coff (ttf)"
+			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
@@ -90,9 +105,21 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
+			<Tool
+				Name="bin2coff (cff)"
+			/>
+			<Tool
+				Name="bin2coff (ttc)"
+			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
+			<Tool
+				Name="bin2coff (otf)"
+			/>
+			<Tool
+				Name="bin2coff (ttf)"
+			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
@@ -146,601 +173,613 @@
 	</References>
 	<Files>
 		<Filter
-			Name="generated"
+			Name="fonts"
 			>
 			<Filter
-				Name="resources"
+				Name="droid"
+				>
+				<File
+					RelativePath="..\..\resources\fonts\droid\DroidSansFallback.ttf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\droid\DroidSansFallbackFull.ttf"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="han"
 				>
-				<Filter
-					Name="fonts"
-					>
-					<Filter
-						Name="urw"
-						>
-						<File
-							RelativePath="..\..\generated\resources\fonts\urw\Dingbats.cff.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\urw\NimbusMonoPS-Bold.cff.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\urw\NimbusMonoPS-BoldItalic.cff.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\urw\NimbusMonoPS-Italic.cff.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\urw\NimbusMonoPS-Regular.cff.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\urw\NimbusRoman-Bold.cff.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\urw\NimbusRoman-BoldItalic.cff.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\urw\NimbusRoman-Italic.cff.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\urw\NimbusRoman-Regular.cff.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\urw\NimbusSans-Bold.cff.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\urw\NimbusSans-BoldOblique.cff.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\urw\NimbusSans-Oblique.cff.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\urw\NimbusSans-Regular.cff.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\urw\StandardSymbolsPS.cff.c"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="han"
-						>
-						<File
-							RelativePath="..\..\generated\resources\fonts\han\SourceHanSerif-Regular.ttc.c"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="droid"
-						>
-						<File
-							RelativePath="..\..\generated\resources\fonts\droid\DroidSansFallback.ttf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\droid\DroidSansFallbackFull.ttf.c"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="noto"
-						>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoEmoji-Regular.ttf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoKufiArabic-Regular.ttf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoNaskhArabic-Regular.ttf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoNastaliqUrdu-Regular.ttf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSans-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansAdlam-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansAhom-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansAnatolianHieroglyphs-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansArabic-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansAvestan-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansBamum-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansBassaVah-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansBatak-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansBengali-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansBhaiksuki-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansBrahmi-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansBuginese-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansBuhid-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansCanadianAboriginal-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansCarian-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansChakma-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansCham-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansCherokee-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansCoptic-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansCuneiform-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansCypriot-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansDeseret-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansDevanagari-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansEgyptianHieroglyphs-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansElbasan-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansGlagolitic-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansGothic-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansHanunoo-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansHatran-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansImperialAramaic-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansInscriptionalPahlavi-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansInscriptionalParthian-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansJavanese-Regular.ttf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansKaithi-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansKayahLi-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansKharoshthi-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansLepcha-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansLimbu-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansLinearA-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansLinearB-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansLisu-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansLycian-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansLydian-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansMalayalam-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansMandaic-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansManichaean-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansMarchen-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansMeeteiMayek-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansMendeKikakui-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansMeroitic-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansMiao-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansMongolian-Regular.ttf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansMro-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansMultani-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansNabataean-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansNewa-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansNewTaiLue-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansNKo-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansOgham-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansOlChiki-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansOldItalic-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansOldNorthArabian-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansOldPermic-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansOldPersian-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansOldSouthArabian-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansOldTurkic-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansOriya-Regular.ttf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansOsage-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansOsmanya-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansPahawhHmong-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansPalmyrene-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansPauCinHau-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansPhagsPa-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansPhoenician-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansRejang-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansRunic-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansSamaritan-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansSaurashtra-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansSharada-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansShavian-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansSoraSompeng-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansSundanese-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansSylotiNagri-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansSymbols-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansSymbols2-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansSyriacEastern-Regular.ttf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansSyriacEstrangela-Regular.ttf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansSyriacWestern-Regular.ttf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansTagalog-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansTagbanwa-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansTaiLe-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansTaiTham-Regular.ttf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansTaiViet-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansThaana-Regular.ttf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansTibetan-Regular.ttf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansTifinagh-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansUgaritic-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansVai-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSansYi-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSerif-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSerifArmenian-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSerifBalinese-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSerifEthiopic-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSerifGeorgian-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSerifGujarati-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSerifGurmukhi-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSerifHebrew-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSerifKannada-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSerifKhmer-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSerifLao-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSerifMyanmar-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSerifSinhala-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSerifTamil-Regular.otf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSerifTelugu-Regular.ttf.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\noto\NotoSerifThai-Regular.otf.c"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="sil"
-						>
-						<File
-							RelativePath="..\..\generated\resources\fonts\sil\CharisSIL-B.cff.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\sil\CharisSIL-BI.cff.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\sil\CharisSIL-I.cff.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\generated\resources\fonts\sil\CharisSIL-R.cff.c"
-							>
-						</File>
-					</Filter>
-				</Filter>
+				<File
+					RelativePath="..\..\resources\fonts\han\SourceHanSerif-Regular.ttc"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="noto"
+				>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoEmoji-Regular.ttf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoKufiArabic-Regular.ttf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoNaskhArabic-Regular.ttf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoNastaliqUrdu-Regular.ttf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSans-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansAdlam-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansAhom-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansAnatolianHieroglyphs-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansArabic-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansAvestan-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansBamum-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansBassaVah-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansBatak-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansBengali-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansBhaiksuki-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansBrahmi-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansBuginese-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansBuhid-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansCanadianAboriginal-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansCarian-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansChakma-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansCham-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansCherokee-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansCoptic-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansCuneiform-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansCypriot-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansDeseret-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansDevanagari-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansEgyptianHieroglyphs-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansElbasan-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansGlagolitic-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansGothic-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansHanunoo-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansHatran-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansImperialAramaic-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansInscriptionalPahlavi-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansInscriptionalParthian-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansJavanese-Regular.ttf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansKaithi-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansKayahLi-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansKharoshthi-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansLepcha-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansLimbu-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansLinearA-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansLinearB-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansLisu-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansLycian-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansLydian-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansMalayalam-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansMandaic-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansManichaean-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansMarchen-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansMeeteiMayek-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansMendeKikakui-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansMeroitic-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansMiao-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansMongolian-Regular.ttf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansMro-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansMultani-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansNabataean-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansNewa-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansNewTaiLue-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansNKo-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansOgham-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansOlChiki-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansOldItalic-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansOldNorthArabian-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansOldPermic-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansOldPersian-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansOldSouthArabian-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansOldTurkic-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansOriya-Regular.ttf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansOsage-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansOsmanya-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansPahawhHmong-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansPalmyrene-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansPauCinHau-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansPhagsPa-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansPhoenician-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansRejang-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansRunic-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansSamaritan-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansSaurashtra-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansSharada-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansShavian-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansSoraSompeng-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansSundanese-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansSylotiNagri-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansSymbols-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansSymbols2-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansSyriacEastern-Regular.ttf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansSyriacEstrangela-Regular.ttf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansSyriacWestern-Regular.ttf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansTagalog-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansTagbanwa-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansTaiLe-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansTaiTham-Regular.ttf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansTaiViet-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansThaana-Regular.ttf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansTibetan-Regular.ttf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansTifinagh-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansUgaritic-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansVai-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSansYi-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSerif-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSerifArmenian-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSerifBalinese-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSerifEthiopic-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSerifGeorgian-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSerifGujarati-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSerifGurmukhi-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSerifHebrew-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSerifKannada-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSerifKhmer-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSerifLao-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSerifMyanmar-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSerifSinhala-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSerifTamil-Regular.otf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSerifTelugu-Regular.ttf"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\noto\NotoSerifThai-Regular.otf"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="sil"
+				>
+				<File
+					RelativePath="..\..\resources\fonts\sil\CharisSIL-B.cff"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\sil\CharisSIL-BI.cff"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\sil\CharisSIL-I.cff"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\sil\CharisSIL-R.cff"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="urw"
+				>
+				<File
+					RelativePath="..\..\resources\fonts\urw\Dingbats.cff"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\urw\NimbusMonoPS-Bold.cff"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\urw\NimbusMonoPS-BoldItalic.cff"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\urw\NimbusMonoPS-Italic.cff"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\urw\NimbusMonoPS-Regular.cff"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\urw\NimbusRoman-Bold.cff"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\urw\NimbusRoman-BoldItalic.cff"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\urw\NimbusRoman-Italic.cff"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\urw\NimbusRoman-Regular.cff"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\urw\NimbusSans-Bold.cff"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\urw\NimbusSans-BoldOblique.cff"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\urw\NimbusSans-Oblique.cff"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\urw\NimbusSans-Regular.cff"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\urw\NimbusSansNarrow-BdOblique.cff"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\urw\NimbusSansNarrow-Bold.cff"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\urw\NimbusSansNarrow-Oblique.cff"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\urw\NimbusSansNarrow-Regular.cff"
+					>
+				</File>
+				<File
+					RelativePath="..\..\resources\fonts\urw\StandardSymbolsPS.cff"
+					>
+				</File>
 			</Filter>
 		</Filter>
+		<File
+			RelativePath=".\dummy.c"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/platform/win32/mupdf.sln b/platform/win32/mupdf.sln
index 3fddd1f6..ae77cb49 100644
--- a/platform/win32/mupdf.sln
+++ b/platform/win32/mupdf.sln
@@ -3,23 +3,23 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdf", "mupdf.vcproj", "{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
 		{22462382-B30D-42A5-BF07-EE1A35E25D21} = {22462382-B30D-42A5-BF07-EE1A35E25D21}
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libthirdparty", "libthirdparty.vcproj", "{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmupdf", "libmupdf.vcproj", "{5F615F91-DFF8-4F05-BF48-6222B7D86519}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
-		{A5053AA7-02E5-4903-B596-04F17AEB1526} = {A5053AA7-02E5-4903-B596-04F17AEB1526}
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22} = {52DCAB29-C8EE-4422-954C-29AFA6B33E22}
+		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mudraw", "mudraw.vcproj", "{0B51171B-B10E-4EAC-8FFA-19226A1828A3}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
+		{52DCAB29-C8EE-4422-954C-29AFA6B33E22} = {52DCAB29-C8EE-4422-954C-29AFA6B33E22}
 		{DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B} = {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mutool", "mutool.vcproj", "{00811970-815B-4F64-BC9D-219078B1F3AA}"
@@ -27,67 +27,62 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mutool", "mutool.vcproj", "
 		{FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B} = {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generated", "generated.vcproj", "{A5053AA7-02E5-4903-B596-04F17AEB1526}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\..\thirdparty\curl\vs\vc8\lib\vc8libcurl.vcproj", "{87EE9DA4-DE1E-4448-8324-183C98DCA588}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdf-curl", "mupdf-curl.vcproj", "{27B53E5C-ACAB-423C-854E-BECE56D73544}"
 	ProjectSection(ProjectDependencies) = postProject
-		{22462382-B30D-42A5-BF07-EE1A35E25D21} = {22462382-B30D-42A5-BF07-EE1A35E25D21}
-		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
+		{22462382-B30D-42A5-BF07-EE1A35E25D21} = {22462382-B30D-42A5-BF07-EE1A35E25D21}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mujstest", "mujstest.vcproj", "{21E28758-E4D2-4B84-8EC5-B631CEE66B30}"
 	ProjectSection(ProjectDependencies) = postProject
-		{22462382-B30D-42A5-BF07-EE1A35E25D21} = {22462382-B30D-42A5-BF07-EE1A35E25D21}
 		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
+		{22462382-B30D-42A5-BF07-EE1A35E25D21} = {22462382-B30D-42A5-BF07-EE1A35E25D21}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfreeglut", "libfreeglut.vcproj", "{A1B75D29-9F5C-4A0F-B368-322A10477D0C}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdf-gl", "mupdf-gl.vcproj", "{CE3A76A8-A28F-4991-8FB9-C9453D922037}"
 	ProjectSection(ProjectDependencies) = postProject
-		{A1B75D29-9F5C-4A0F-B368-322A10477D0C} = {A1B75D29-9F5C-4A0F-B368-322A10477D0C}
 		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
+		{A1B75D29-9F5C-4A0F-B368-322A10477D0C} = {A1B75D29-9F5C-4A0F-B368-322A10477D0C}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libresources", "libresources.vcproj", "{52DCAB29-C8EE-4422-954C-29AFA6B33E22}"
 	ProjectSection(ProjectDependencies) = postProject
-		{A5053AA7-02E5-4903-B596-04F17AEB1526} = {A5053AA7-02E5-4903-B596-04F17AEB1526}
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7} = {BFE316B3-BD90-433A-A20D-C73975F1CAA7}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "muraster", "muraster.vcproj", "{0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
-		{DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B} = {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22} = {52DCAB29-C8EE-4422-954C-29AFA6B33E22}
+		{DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B} = {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "javaviewerlib", "javaviewerlib.vcproj", "{3DB35F2D-9679-4DED-BA0C-240A4E6E6674}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22} = {52DCAB29-C8EE-4422-954C-29AFA6B33E22}
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "javaviewer", "javaviewer.vcproj", "{FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
-		{3DB35F2D-9679-4DED-BA0C-240A4E6E6674} = {3DB35F2D-9679-4DED-BA0C-240A4E6E6674}
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22} = {52DCAB29-C8EE-4422-954C-29AFA6B33E22}
+		{3DB35F2D-9679-4DED-BA0C-240A4E6E6674} = {3DB35F2D-9679-4DED-BA0C-240A4E6E6674}
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluratech", "libluratech.vcproj", "{B0091365-C9BA-4F40-AE2B-EF93702871B2}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmuthreads", "libmuthreads.vcproj", "{DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A5053AA7-02E5-4903-B596-04F17AEB1526} = {A5053AA7-02E5-4903-B596-04F17AEB1526}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mu-office-lib", "mu-office-lib.vcproj", "{FFF91365-C9BA-4F40-AE2B-EF93702871B2}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
 		{DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B} = {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mu-office-test", "mu-office-test.vcproj", "{FB51171B-B10E-4EAC-8FFA-19226A1828A3}"
@@ -97,22 +92,21 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mu-office-test", "mu-office
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmutool", "libmutool.vcproj", "{FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
-		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
-		{DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B} = {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}
 		{22462382-B30D-42A5-BF07-EE1A35E25D21} = {22462382-B30D-42A5-BF07-EE1A35E25D21}
+		{DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B} = {DE21FA8A-FC8A-47E0-87E4-DCE8808BFC9B}
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
+		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mutool-lura", "mutool-lura.vcproj", "{00197081-815B-4F64-BC9D-219078B1F3AA}"
 	ProjectSection(ProjectDependencies) = postProject
-		{FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B} = {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}
 		{B0091365-C9BA-4F40-AE2B-EF93702871B2} = {B0091365-C9BA-4F40-AE2B-EF93702871B2}
+		{FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B} = {FA8ADE21-FC8A-47E0-87E4-DCE8808BFC9B}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpkcs7", "libpkcs7.vcproj", "{22462382-B30D-42A5-BF07-EE1A35E25D21}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A5053AA7-02E5-4903-B596-04F17AEB1526} = {A5053AA7-02E5-4903-B596-04F17AEB1526}
-	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bin2coff", "bin2coff.vcproj", "{BFE316B3-BD90-433A-A20D-C73975F1CAA7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -335,47 +329,6 @@ Global
 		{00811970-815B-4F64-BC9D-219078B1F3AA}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32
 		{00811970-815B-4F64-BC9D-219078B1F3AA}.ReleaseOpenssl|Win32.Build.0 = Release|Win32
 		{00811970-815B-4F64-BC9D-219078B1F3AA}.ReleaseOpenssl|x64.ActiveCfg = Release|x64
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.Debug|Win32.Build.0 = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.Debug|x64.ActiveCfg = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.Debug|x64.Build.0 = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.DebugCommercial|Win32.ActiveCfg = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.DebugCommercial|Win32.Build.0 = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.DebugCommercial|x64.ActiveCfg = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.DebugCommercial|x64.Build.0 = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.DebugGProof|Win32.ActiveCfg = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.DebugGProof|Win32.Build.0 = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.DebugGProof|x64.ActiveCfg = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.DebugGProof|x64.Build.0 = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.DebugJava|Win32.ActiveCfg = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.DebugJava|Win32.Build.0 = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.DebugJava|x64.ActiveCfg = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.DebugJava|x64.Build.0 = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.DebugOpenssl|Win32.Build.0 = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.DebugOpenssl|x64.ActiveCfg = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.Memento|Win32.ActiveCfg = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.Memento|Win32.Build.0 = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.Memento|x64.ActiveCfg = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.Memento|x64.Build.0 = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.MementoCommercial|Win32.ActiveCfg = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.MementoCommercial|Win32.Build.0 = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.MementoCommercial|x64.ActiveCfg = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.MementoCommercial|x64.Build.0 = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.Release|Win32.ActiveCfg = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.Release|Win32.Build.0 = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.Release|x64.ActiveCfg = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.Release|x64.Build.0 = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.ReleaseCommercial|Win32.ActiveCfg = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.ReleaseCommercial|Win32.Build.0 = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.ReleaseCommercial|x64.ActiveCfg = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.ReleaseJava|Win32.ActiveCfg = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.ReleaseJava|Win32.Build.0 = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.ReleaseJava|x64.ActiveCfg = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.ReleaseJava|x64.Build.0 = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.ReleaseOpenssl|Win32.ActiveCfg = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.ReleaseOpenssl|Win32.Build.0 = Debug|Win32
-		{A5053AA7-02E5-4903-B596-04F17AEB1526}.ReleaseOpenssl|x64.ActiveCfg = Debug|Win32
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.Debug|Win32.ActiveCfg = Debug|Win32
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.Debug|Win32.Build.0 = Debug|Win32
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.Debug|x64.ActiveCfg = Debug|x64
@@ -948,6 +901,39 @@ Global
 		{22462382-B30D-42A5-BF07-EE1A35E25D21}.ReleaseOpenssl|Win32.Build.0 = ReleaseOpenssl|Win32
 		{22462382-B30D-42A5-BF07-EE1A35E25D21}.ReleaseOpenssl|x64.ActiveCfg = ReleaseOpenssl|x64
 		{22462382-B30D-42A5-BF07-EE1A35E25D21}.ReleaseOpenssl|x64.Build.0 = ReleaseOpenssl|x64
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.Debug|Win32.ActiveCfg = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.Debug|Win32.Build.0 = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.Debug|x64.ActiveCfg = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.DebugCommercial|Win32.ActiveCfg = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.DebugCommercial|Win32.Build.0 = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.DebugCommercial|x64.ActiveCfg = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.DebugGProof|Win32.ActiveCfg = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.DebugGProof|Win32.Build.0 = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.DebugGProof|x64.ActiveCfg = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.DebugJava|Win32.ActiveCfg = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.DebugJava|Win32.Build.0 = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.DebugJava|x64.ActiveCfg = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.DebugOpenssl|Win32.ActiveCfg = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.DebugOpenssl|Win32.Build.0 = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.DebugOpenssl|x64.ActiveCfg = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.Memento|Win32.ActiveCfg = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.Memento|Win32.Build.0 = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.Memento|x64.ActiveCfg = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.MementoCommercial|Win32.ActiveCfg = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.MementoCommercial|Win32.Build.0 = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.MementoCommercial|x64.ActiveCfg = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.Release|Win32.ActiveCfg = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.Release|Win32.Build.0 = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.Release|x64.ActiveCfg = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.ReleaseCommercial|Win32.ActiveCfg = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.ReleaseCommercial|Win32.Build.0 = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.ReleaseCommercial|x64.ActiveCfg = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.ReleaseJava|Win32.ActiveCfg = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.ReleaseJava|Win32.Build.0 = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.ReleaseJava|x64.ActiveCfg = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.ReleaseOpenssl|Win32.Build.0 = Release|Win32
+		{BFE316B3-BD90-433A-A20D-C73975F1CAA7}.ReleaseOpenssl|x64.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
-- 
cgit v1.2.3