MSVC: Add DebugJava/ReleaseJava configurations.

These build the mupdf desktop java viewer.

9 files changed, 1464 insertions, 477 deletions

diff --git a/platform/java/winmake.bat b/platform/java/winmake.bat
new file mode 100644
index 00000000..ac18b5f6
--- /dev/null
+++ b/platform/java/winmake.bat
@@ -0,0 +1,17 @@
+@echo Cleaning
+echo bogus > example\bogus.class
+del /Q example\*.class
+echo bogus > com\artifex\mupdf\fitz\bogus.class
+del /Q com\artifex\mupdf\fitz\*.class
+
+@echo Building Viewer
+javac -source 1.7 -target 1.7 example/Viewer.java
+
+@echo Building JNI classes
+javac -source 1.7 -target 1.7 com/artifex/mupdf/fitz/*.java
+
+@echo Importing DLL (built using VS solution)
+@copy ..\win32\%1\javaviewerlib.dll mupdf_java.dll /y
+
+@echo Packaging into jar (incomplete as missing manifest)
+jar cf javaviewer.jar mupdf_java.dll com\artifex\mupdf\fitz\*.java example\viewer.java
diff --git a/platform/win32/javaviewer.vcproj b/platform/win32/javaviewer.vcproj
new file mode 100644
index 00000000..3b54d023
--- /dev/null
+++ b/platform/win32/javaviewer.vcproj
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="javaviewer"
+	ProjectGUID="{FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}"
+	RootNamespace="javaviewer"
+	Keyword="MakeFileProj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="DebugJava|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="0"
+			>
+			<Tool
+				Name="VCNMakeTool"
+				BuildCommandLine="cd ..\java &amp;&amp; winmake.bat $(PlatformName)\$(ConfigurationName)"
+				ReBuildCommandLine="cd ..\java &amp;&amp; winmake.bat $(PlatformName)\$(ConfigurationName)"
+				CleanCommandLine=""
+				Output="javaviewer.jar"
+				PreprocessorDefinitions="WIN32;_DEBUG"
+				IncludeSearchPath=""
+				ForcedIncludes=""
+				AssemblySearchPath=""
+				ForcedUsingAssemblies=""
+				CompileAsManaged=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="DebugJava|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="0"
+			>
+			<Tool
+				Name="VCNMakeTool"
+				BuildCommandLine="cd ..\java &amp;&amp; winmake.bat $(PlatformName)\$(ConfigurationName)"
+				ReBuildCommandLine="cd ..\java &amp;&amp; winmake.bat $(PlatformName)\$(ConfigurationName)"
+				CleanCommandLine=""
+				Output="javaviewer.jar"
+				PreprocessorDefinitions="WIN32;_DEBUG"
+				IncludeSearchPath=""
+				ForcedIncludes=""
+				AssemblySearchPath=""
+				ForcedUsingAssemblies=""
+				CompileAsManaged=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseJava|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="0"
+			>
+			<Tool
+				Name="VCNMakeTool"
+				BuildCommandLine=""
+				ReBuildCommandLine=""
+				CleanCommandLine=""
+				Output="javaviewer.exe"
+				PreprocessorDefinitions="WIN32;NDEBUG"
+				IncludeSearchPath=""
+				ForcedIncludes=""
+				AssemblySearchPath=""
+				ForcedUsingAssemblies=""
+				CompileAsManaged=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseJava|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="0"
+			>
+			<Tool
+				Name="VCNMakeTool"
+				BuildCommandLine="cd ..\java &amp;&amp; winmake.bat $(PlatformName)\$(ConfigurationName)"
+				ReBuildCommandLine="cd ..\java &amp;&amp; winmake.bat $(PlatformName)\$(ConfigurationName)"
+				CleanCommandLine=""
+				Output="javaviewer.exe"
+				PreprocessorDefinitions="WIN32;NDEBUG"
+				IncludeSearchPath=""
+				ForcedIncludes=""
+				AssemblySearchPath=""
+				ForcedUsingAssemblies=""
+				CompileAsManaged=""
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\java\example\PageCanvas.java"
+			>
+		</File>
+		<File
+			RelativePath="..\java\example\Viewer.java"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/platform/win32/javaviewerlib.vcproj b/platform/win32/javaviewerlib.vcproj
new file mode 100644
index 00000000..8b2714df
--- /dev/null
+++ b/platform/win32/javaviewerlib.vcproj
@@ -0,0 +1,454 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="javaviewerlib"
+	ProjectGUID="{3DB35F2D-9679-4DED-BA0C-240A4E6E6674}"
+	RootNamespace="javaviewerlib"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="DebugJava|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../include;$(JAVA_HOME)/include;$(JAVA_HOME)/include/win32"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;JAVAVIEWERLIB_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="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>
+		<Configuration
+			Name="DebugJava|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../include;$(JAVA_HOME)/include;$(JAVA_HOME)/include/win32"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;JAVAVIEWERLIB_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="17"
+			/>
+			<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>
+		<Configuration
+			Name="ReleaseJava|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../include;$(JAVA_HOME)/include;$(JAVA_HOME)/include/win32"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;JAVAVIEWERLIB_EXPORTS"
+				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="2"
+				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>
+		<Configuration
+			Name="ReleaseJava|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../include;$(JAVA_HOME)/include;$(JAVA_HOME)/include/win32"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;JAVAVIEWERLIB_EXPORTS"
+				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="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<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>
+		<Filter
+			Name="com/artifex/mupdf/fitz"
+			>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\Annotation.java"
+				>
+			</File>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\ColorSpace.java"
+				>
+			</File>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\Context.java"
+				>
+			</File>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\Cookie.java"
+				>
+			</File>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\Device.java"
+				>
+			</File>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\DisplayList.java"
+				>
+			</File>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\DisplayListDevice.java"
+				>
+			</File>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\Document.java"
+				>
+			</File>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\DrawDevice.java"
+				>
+			</File>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\Font.java"
+				>
+			</File>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\Image.java"
+				>
+			</File>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\Link.java"
+				>
+			</File>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\Matrix.java"
+				>
+			</File>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\NativeDevice.java"
+				>
+			</File>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\Outline.java"
+				>
+			</File>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\Page.java"
+				>
+			</File>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\Path.java"
+				>
+			</File>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\PathWalker.java"
+				>
+			</File>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\Pixmap.java"
+				>
+			</File>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\Point.java"
+				>
+			</File>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\Rect.java"
+				>
+			</File>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\RectI.java"
+				>
+			</File>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\Shade.java"
+				>
+			</File>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\StrokeState.java"
+				>
+			</File>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\Text.java"
+				>
+			</File>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\TextWalker.java"
+				>
+			</File>
+			<File
+				RelativePath="..\java\com\artifex\mupdf\fitz\TryLaterException.java"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\java\mupdf_native.c"
+			>
+		</File>
+		<File
+			RelativePath="..\java\mupdf_native.h"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/platform/win32/jni.vcproj b/platform/win32/jni.vcproj
deleted file mode 100644
index 241fabb4..00000000
--- a/platform/win32/jni.vcproj
+++ /dev/null
@@ -1,441 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="jni"
-	ProjectGUID="{05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}"
-	RootNamespace="jni"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				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="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			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;_LIB"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				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="java"
-			>
-			<File
-				RelativePath="..\android\src\com\artifex\mupdf\fitz\AndroidDrawDevice.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdf\fitz\Annotation.java"
-				>
-			</File>
-			<File
-				RelativePath="..\android\src\com\artifex\mupdf\fitz\AwtDrawDevice.java"
-				>
-			</File>
-			<File
-				RelativePath="..\android\src\com\artifex\mupdf\fitz\CDevice.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdf\fitz\ColorSpace.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdf\fitz\Context.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdf\fitz\Cookie.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdf\fitz\Device.java"
-				>
-			</File>
-			<File
-				RelativePath="..\android\src\com\artifex\mupdf\fitz\DisplayList.java"
-				>
-			</File>
-			<File
-				RelativePath="..\android\src\com\artifex\mupdf\fitz\DisplayListDevice.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdf\fitz\Document.java"
-				>
-			</File>
-			<File
-				RelativePath="..\android\src\com\artifex\mupdf\fitz\Font.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdf\fitz\Image.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdf\fitz\Link.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdf\fitz\Matrix.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdf\fitz\Outline.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdf\fitz\Page.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdf\fitz\Path.java"
-				>
-			</File>
-			<File
-				RelativePath="..\android\src\com\artifex\mupdf\fitz\PathProcessor.java"
-				>
-			</File>
-			<File
-				RelativePath="..\android\src\com\artifex\mupdf\fitz\Point.java"
-				>
-			</File>
-			<File
-				RelativePath="..\android\src\com\artifex\mupdf\fitz\Rect.java"
-				>
-			</File>
-			<File
-				RelativePath="..\android\src\com\artifex\mupdf\fitz\RectI.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdf\fitz\Shade.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdf\fitz\StrokeState.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdf\fitz\Text.java"
-				>
-			</File>
-			<File
-				RelativePath="..\android\src\com\artifex\mupdf\fitz\TryLaterException.java"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="javaapp"
-			>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\Annotation.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\ArrayDeque.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\AsyncTask.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\ChoosePDFActivity.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\ChoosePDFAdapter.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\ChoosePDFItem.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\Deque.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\FilePicker.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\LinkInfo.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\LinkInfoExternal.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\LinkInfoInternal.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\LinkInfoRemote.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\LinkInfoVisitor.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\MuPDFActivity.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\MuPDFAlert.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\MuPDFAlertInternal.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\MuPDFCore.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\MuPDFPageAdapter.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\MuPDFPageView.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\MuPDFReaderView.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\MuPDFReflowAdapter.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\MuPDFReflowView.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\MuPDFView.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\OutlineActivity.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\OutlineActivityData.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\OutlineAdapter.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\OutlineItem.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\PageView.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\PrintDialogActivity.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\ReaderView.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\SafeAnimatorInflater.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\SearchTask.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\SearchTaskResult.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\TextChar.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\TextWord.java"
-				>
-			</File>
-			<File
-				RelativePath="..\..\platform\android\src\com\artifex\mupdfdemo\WidgetType.java"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\platform\android\jni\mupdf.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				ExcludedFromBuild="true"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\platform\android\jni\mupdf_native.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				ExcludedFromBuild="true"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/platform/win32/libfonts.vcproj b/platform/win32/libfonts.vcproj
index 9ab7dcda..f9490fa3 100644
--- a/platform/win32/libfonts.vcproj
+++ b/platform/win32/libfonts.vcproj
@@ -384,6 +384,250 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="DebugJava|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				IgnoreAllDefaultLibraries="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="DebugJava|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				IgnoreAllDefaultLibraries="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseJava|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				IgnoreAllDefaultLibraries="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseJava|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				IgnoreAllDefaultLibraries="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
diff --git a/platform/win32/libmupdf.vcproj b/platform/win32/libmupdf.vcproj
index 65b90db8..7ea08ee2 100644
--- a/platform/win32/libmupdf.vcproj
+++ b/platform/win32/libmupdf.vcproj
@@ -772,6 +772,259 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="DebugJava|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg/src/lib/openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src"
+				PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				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="DebugJava|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src"
+				PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				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>
+		<Configuration
+			Name="ReleaseJava|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				Description="Generate CMap and Font source files"
+				CommandLine="generate.bat"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				WholeProgramOptimization="false"
+				AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				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>
+		<Configuration
+			Name="ReleaseJava|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				Description="Generate CMap and Font source files"
+				CommandLine="generate.bat"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				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>
diff --git a/platform/win32/libthirdparty.vcproj b/platform/win32/libthirdparty.vcproj
index 46435aca..ad07b188 100644
--- a/platform/win32/libthirdparty.vcproj
+++ b/platform/win32/libthirdparty.vcproj
@@ -388,6 +388,254 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="DebugJava|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\"
+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;USE_JPIP=1;FT_CONFIG_MODULES_H=\&quot;slimftmodules.h\&quot;;FT_CONFIG_OPTIONS_H=\&quot;slimftoptions.h\&quot;;DEBUG=1;verbose=-1;JBIG_EXTERNAL_MEMENTO_H=\&quot;memento.h\&quot;;HAVE_OT;HAVE_UCDN;HB_NO_MT;hb_malloc_impl=hb_malloc;hb_calloc_impl=hb_calloc;hb_realloc_impl=hb_realloc;hb_free_impl=hb_free"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				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="DebugJava|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\"
+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;USE_JPIP=1;FT_CONFIG_MODULES_H=\&quot;slimftmodules.h\&quot;;FT_CONFIG_OPTIONS_H=\&quot;slimftoptions.h\&quot;;DEBUG=1;verbose=-1;HAVE_OT;HAVE_UCDN;HB_NO_MT;hb_malloc_impl=hb_malloc;hb_calloc_impl=hb_calloc;hb_realloc_impl=hb_realloc;hb_free_impl=hb_free"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				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>
+		<Configuration
+			Name="ReleaseJava|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			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="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\"
+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;USE_JPIP=1;FT_CONFIG_MODULES_H=\&quot;slimftmodules.h\&quot;;FT_CONFIG_OPTIONS_H=\&quot;slimftoptions.h\&quot;;verbose=-1;JBIG_EXTERNAL_MEMENTO_H=\&quot;memento.h\&quot;;HAVE_OT;HAVE_UCDN;HB_NO_MT;hb_malloc_impl=hb_malloc;hb_calloc_impl=hb_calloc;hb_realloc_impl=hb_realloc;hb_free_impl=hb_free"
+				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="true"
+				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>
+		<Configuration
+			Name="ReleaseJava|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\"
+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;USE_JPIP=1;FT_CONFIG_MODULES_H=\&quot;slimftmodules.h\&quot;;FT_CONFIG_OPTIONS_H=\&quot;slimftoptions.h\&quot;;verbose=-1;HAVE_OT;HAVE_UCDN;HB_NO_MT;hb_malloc_impl=hb_malloc;hb_calloc_impl=hb_calloc;hb_realloc_impl=hb_realloc;hb_free_impl=hb_free"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				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>
diff --git a/platform/win32/mupdf-gl.vcproj b/platform/win32/mupdf-gl.vcproj
index 46a2103d..649b951e 100644
--- a/platform/win32/mupdf-gl.vcproj
+++ b/platform/win32/mupdf-gl.vcproj
@@ -98,7 +98,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="1"
 			>
diff --git a/platform/win32/mupdf.sln b/platform/win32/mupdf.sln
index 1b76bc34..805b2e8a 100644
--- a/platform/win32/mupdf.sln
+++ b/platform/win32/mupdf.sln
@@ -3,28 +3,28 @@ 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}
 		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
+		{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
-		{A5053AA7-02E5-4903-B596-04F17AEB1526} = {A5053AA7-02E5-4903-B596-04F17AEB1526}
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22} = {52DCAB29-C8EE-4422-954C-29AFA6B33E22}
+		{A5053AA7-02E5-4903-B596-04F17AEB1526} = {A5053AA7-02E5-4903-B596-04F17AEB1526}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mudraw", "mudraw.vcproj", "{0B51171B-B10E-4EAC-8FFA-19226A1828A3}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
 		{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", "mutool.vcproj", "{00811970-815B-4F64-BC9D-219078B1F3AA}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
 		{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}") = "generated", "generated.vcproj", "{A5053AA7-02E5-4903-B596-04F17AEB1526}"
@@ -33,28 +33,26 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\..\thirdparty
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdf-curl", "mupdf-curl.vcproj", "{27B53E5C-ACAB-423C-854E-BECE56D73544}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
-		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
 		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
+		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mujstest", "mujstest.vcproj", "{21E28758-E4D2-4B84-8EC5-B631CEE66B30}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
 		{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}") = "libglfw", "libglfw.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}
 		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
+		{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}") = "jni", "jni.vcproj", "{05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfonts", "libfonts.vcproj", "{52DCAB29-C8EE-4422-954C-29AFA6B33E22}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A5053AA7-02E5-4903-B596-04F17AEB1526} = {A5053AA7-02E5-4903-B596-04F17AEB1526}
@@ -62,23 +60,38 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfonts", "libfonts.vcproj
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "muraster", "muraster.vcproj", "{0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}"
 	ProjectSection(ProjectDependencies) = postProject
+		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22} = {52DCAB29-C8EE-4422-954C-29AFA6B33E22}
+	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}
 		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "javaviewer", "javaviewer.vcproj", "{FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{3DB35F2D-9679-4DED-BA0C-240A4E6E6674} = {3DB35F2D-9679-4DED-BA0C-240A4E6E6674}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
 		DebugGProof|Win32 = DebugGProof|Win32
 		DebugGProof|x64 = DebugGProof|x64
+		DebugJava|Win32 = DebugJava|Win32
+		DebugJava|x64 = DebugJava|x64
 		DebugOpenssl|Win32 = DebugOpenssl|Win32
 		DebugOpenssl|x64 = DebugOpenssl|x64
 		Memento|Win32 = Memento|Win32
 		Memento|x64 = Memento|x64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
+		ReleaseJava|Win32 = ReleaseJava|Win32
+		ReleaseJava|x64 = ReleaseJava|x64
 		ReleaseOpenssl|Win32 = ReleaseOpenssl|Win32
 		ReleaseOpenssl|x64 = ReleaseOpenssl|x64
 	EndGlobalSection
@@ -91,6 +104,8 @@ Global
 		{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.DebugGProof|Win32.Build.0 = DebugGProof|Win32
 		{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.DebugGProof|x64.ActiveCfg = DebugGProof|x64
 		{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.DebugGProof|x64.Build.0 = DebugGProof|x64
+		{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.DebugJava|Win32.ActiveCfg = Debug|Win32
+		{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.DebugJava|x64.ActiveCfg = Debug|x64
 		{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.DebugOpenssl|Win32.ActiveCfg = DebugOpenssl|Win32
 		{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.DebugOpenssl|Win32.Build.0 = DebugOpenssl|Win32
 		{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.DebugOpenssl|x64.ActiveCfg = DebugOpenssl|x64
@@ -103,6 +118,8 @@ Global
 		{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.Release|Win32.Build.0 = Release|Win32
 		{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.Release|x64.ActiveCfg = Release|x64
 		{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.Release|x64.Build.0 = Release|x64
+		{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.ReleaseJava|Win32.ActiveCfg = ReleaseOpenssl|Win32
+		{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.ReleaseJava|x64.ActiveCfg = ReleaseOpenssl|x64
 		{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.ReleaseOpenssl|Win32.ActiveCfg = ReleaseOpenssl|Win32
 		{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.ReleaseOpenssl|Win32.Build.0 = ReleaseOpenssl|Win32
 		{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.ReleaseOpenssl|x64.ActiveCfg = ReleaseOpenssl|x64
@@ -115,6 +132,10 @@ Global
 		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.DebugGProof|Win32.Build.0 = Debug|Win32
 		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.DebugGProof|x64.ActiveCfg = Debug|x64
 		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.DebugGProof|x64.Build.0 = Debug|x64
+		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.DebugJava|Win32.ActiveCfg = DebugJava|Win32
+		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.DebugJava|Win32.Build.0 = DebugJava|Win32
+		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.DebugJava|x64.ActiveCfg = DebugJava|x64
+		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.DebugJava|x64.Build.0 = DebugJava|x64
 		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32
 		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.DebugOpenssl|Win32.Build.0 = Debug|Win32
 		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.DebugOpenssl|x64.ActiveCfg = Debug|x64
@@ -127,6 +148,10 @@ Global
 		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.Release|Win32.Build.0 = Release|Win32
 		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.Release|x64.ActiveCfg = Release|x64
 		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.Release|x64.Build.0 = Release|x64
+		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.ReleaseJava|Win32.ActiveCfg = ReleaseJava|Win32
+		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.ReleaseJava|Win32.Build.0 = ReleaseJava|Win32
+		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.ReleaseJava|x64.ActiveCfg = ReleaseJava|x64
+		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.ReleaseJava|x64.Build.0 = ReleaseJava|x64
 		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32
 		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.ReleaseOpenssl|Win32.Build.0 = Release|Win32
 		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.ReleaseOpenssl|x64.ActiveCfg = Release|x64
@@ -139,6 +164,10 @@ Global
 		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugGProof|Win32.Build.0 = DebugGProof|Win32
 		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugGProof|x64.ActiveCfg = DebugGProof|x64
 		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugGProof|x64.Build.0 = DebugGProof|x64
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugJava|Win32.ActiveCfg = DebugJava|Win32
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugJava|Win32.Build.0 = DebugJava|Win32
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugJava|x64.ActiveCfg = DebugJava|x64
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugJava|x64.Build.0 = DebugJava|x64
 		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugOpenssl|Win32.ActiveCfg = DebugOpenssl|Win32
 		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugOpenssl|Win32.Build.0 = DebugOpenssl|Win32
 		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugOpenssl|x64.ActiveCfg = DebugOpenssl|x64
@@ -151,6 +180,10 @@ Global
 		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.Release|Win32.Build.0 = Release|Win32
 		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.Release|x64.ActiveCfg = Release|x64
 		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.Release|x64.Build.0 = Release|x64
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.ReleaseJava|Win32.ActiveCfg = ReleaseJava|Win32
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.ReleaseJava|Win32.Build.0 = ReleaseJava|Win32
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.ReleaseJava|x64.ActiveCfg = ReleaseJava|x64
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.ReleaseJava|x64.Build.0 = ReleaseJava|x64
 		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.ReleaseOpenssl|Win32.ActiveCfg = ReleaseOpenssl|Win32
 		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.ReleaseOpenssl|Win32.Build.0 = ReleaseOpenssl|Win32
 		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.ReleaseOpenssl|x64.ActiveCfg = ReleaseOpenssl|x64
@@ -163,6 +196,8 @@ Global
 		{0B51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugGProof|Win32.Build.0 = DebugGProof|Win32
 		{0B51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugGProof|x64.ActiveCfg = DebugGProof|x64
 		{0B51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugGProof|x64.Build.0 = DebugGProof|x64
+		{0B51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugJava|Win32.ActiveCfg = Debug|Win32
+		{0B51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugJava|x64.ActiveCfg = Debug|x64
 		{0B51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32
 		{0B51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugOpenssl|Win32.Build.0 = Debug|Win32
 		{0B51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugOpenssl|x64.ActiveCfg = Debug|x64
@@ -175,6 +210,8 @@ Global
 		{0B51171B-B10E-4EAC-8FFA-19226A1828A3}.Release|Win32.Build.0 = Release|Win32
 		{0B51171B-B10E-4EAC-8FFA-19226A1828A3}.Release|x64.ActiveCfg = Release|x64
 		{0B51171B-B10E-4EAC-8FFA-19226A1828A3}.Release|x64.Build.0 = Release|x64
+		{0B51171B-B10E-4EAC-8FFA-19226A1828A3}.ReleaseJava|Win32.ActiveCfg = Release|Win32
+		{0B51171B-B10E-4EAC-8FFA-19226A1828A3}.ReleaseJava|x64.ActiveCfg = Release|x64
 		{0B51171B-B10E-4EAC-8FFA-19226A1828A3}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32
 		{0B51171B-B10E-4EAC-8FFA-19226A1828A3}.ReleaseOpenssl|Win32.Build.0 = Release|Win32
 		{0B51171B-B10E-4EAC-8FFA-19226A1828A3}.ReleaseOpenssl|x64.ActiveCfg = Release|x64
@@ -187,6 +224,8 @@ Global
 		{00811970-815B-4F64-BC9D-219078B1F3AA}.DebugGProof|Win32.Build.0 = DebugGProof|Win32
 		{00811970-815B-4F64-BC9D-219078B1F3AA}.DebugGProof|x64.ActiveCfg = DebugGProof|x64
 		{00811970-815B-4F64-BC9D-219078B1F3AA}.DebugGProof|x64.Build.0 = DebugGProof|x64
+		{00811970-815B-4F64-BC9D-219078B1F3AA}.DebugJava|Win32.ActiveCfg = Debug|Win32
+		{00811970-815B-4F64-BC9D-219078B1F3AA}.DebugJava|x64.ActiveCfg = Debug|x64
 		{00811970-815B-4F64-BC9D-219078B1F3AA}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32
 		{00811970-815B-4F64-BC9D-219078B1F3AA}.DebugOpenssl|Win32.Build.0 = Debug|Win32
 		{00811970-815B-4F64-BC9D-219078B1F3AA}.DebugOpenssl|x64.ActiveCfg = Debug|x64
@@ -199,6 +238,8 @@ Global
 		{00811970-815B-4F64-BC9D-219078B1F3AA}.Release|Win32.Build.0 = Release|Win32
 		{00811970-815B-4F64-BC9D-219078B1F3AA}.Release|x64.ActiveCfg = Release|x64
 		{00811970-815B-4F64-BC9D-219078B1F3AA}.Release|x64.Build.0 = Release|x64
+		{00811970-815B-4F64-BC9D-219078B1F3AA}.ReleaseJava|Win32.ActiveCfg = Release|Win32
+		{00811970-815B-4F64-BC9D-219078B1F3AA}.ReleaseJava|x64.ActiveCfg = Release|x64
 		{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
@@ -211,6 +252,10 @@ Global
 		{A5053AA7-02E5-4903-B596-04F17AEB1526}.DebugGProof|Win32.Build.0 = Debug|Win32
 		{A5053AA7-02E5-4903-B596-04F17AEB1526}.DebugGProof|x64.ActiveCfg = Debug|x64
 		{A5053AA7-02E5-4903-B596-04F17AEB1526}.DebugGProof|x64.Build.0 = Debug|x64
+		{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|x64
+		{A5053AA7-02E5-4903-B596-04F17AEB1526}.DebugJava|x64.Build.0 = Debug|x64
 		{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
@@ -223,6 +268,10 @@ Global
 		{A5053AA7-02E5-4903-B596-04F17AEB1526}.Release|Win32.Build.0 = Release|Win32
 		{A5053AA7-02E5-4903-B596-04F17AEB1526}.Release|x64.ActiveCfg = Release|Win32
 		{A5053AA7-02E5-4903-B596-04F17AEB1526}.Release|x64.Build.0 = Release|Win32
+		{A5053AA7-02E5-4903-B596-04F17AEB1526}.ReleaseJava|Win32.ActiveCfg = Release|Win32
+		{A5053AA7-02E5-4903-B596-04F17AEB1526}.ReleaseJava|Win32.Build.0 = Release|Win32
+		{A5053AA7-02E5-4903-B596-04F17AEB1526}.ReleaseJava|x64.ActiveCfg = Release|x64
+		{A5053AA7-02E5-4903-B596-04F17AEB1526}.ReleaseJava|x64.Build.0 = Release|x64
 		{A5053AA7-02E5-4903-B596-04F17AEB1526}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32
 		{A5053AA7-02E5-4903-B596-04F17AEB1526}.ReleaseOpenssl|Win32.Build.0 = Release|Win32
 		{A5053AA7-02E5-4903-B596-04F17AEB1526}.ReleaseOpenssl|x64.ActiveCfg = Release|Win32
@@ -235,6 +284,8 @@ Global
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.DebugGProof|Win32.Build.0 = Debug|Win32
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.DebugGProof|x64.ActiveCfg = DebugGProof|x64
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.DebugGProof|x64.Build.0 = DebugGProof|x64
+		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.DebugJava|Win32.ActiveCfg = Debug|Win32
+		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.DebugJava|x64.ActiveCfg = Debug|x64
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.DebugOpenssl|Win32.Build.0 = Debug|Win32
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.DebugOpenssl|x64.ActiveCfg = Debug|x64
@@ -247,6 +298,8 @@ Global
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.Release|Win32.Build.0 = Release|Win32
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.Release|x64.ActiveCfg = Release|x64
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.Release|x64.Build.0 = Release|x64
+		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.ReleaseJava|Win32.ActiveCfg = Release|Win32
+		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.ReleaseJava|x64.ActiveCfg = Release|x64
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.ReleaseOpenssl|Win32.Build.0 = Release|Win32
 		{87EE9DA4-DE1E-4448-8324-183C98DCA588}.ReleaseOpenssl|x64.ActiveCfg = Release|x64
@@ -254,26 +307,24 @@ Global
 		{27B53E5C-ACAB-423C-854E-BECE56D73544}.Debug|Win32.ActiveCfg = Debug|Win32
 		{27B53E5C-ACAB-423C-854E-BECE56D73544}.Debug|Win32.Build.0 = Debug|Win32
 		{27B53E5C-ACAB-423C-854E-BECE56D73544}.Debug|x64.ActiveCfg = Debug|x64
-		{27B53E5C-ACAB-423C-854E-BECE56D73544}.Debug|x64.Build.0 = Debug|x64
 		{27B53E5C-ACAB-423C-854E-BECE56D73544}.DebugGProof|Win32.ActiveCfg = Debug|Win32
 		{27B53E5C-ACAB-423C-854E-BECE56D73544}.DebugGProof|x64.ActiveCfg = DebugOpenssl|x64
-		{27B53E5C-ACAB-423C-854E-BECE56D73544}.DebugGProof|x64.Build.0 = DebugOpenssl|x64
+		{27B53E5C-ACAB-423C-854E-BECE56D73544}.DebugJava|Win32.ActiveCfg = Debug|Win32
+		{27B53E5C-ACAB-423C-854E-BECE56D73544}.DebugJava|x64.ActiveCfg = Debug|x64
 		{27B53E5C-ACAB-423C-854E-BECE56D73544}.DebugOpenssl|Win32.ActiveCfg = DebugOpenssl|Win32
 		{27B53E5C-ACAB-423C-854E-BECE56D73544}.DebugOpenssl|Win32.Build.0 = DebugOpenssl|Win32
 		{27B53E5C-ACAB-423C-854E-BECE56D73544}.DebugOpenssl|x64.ActiveCfg = DebugOpenssl|x64
-		{27B53E5C-ACAB-423C-854E-BECE56D73544}.DebugOpenssl|x64.Build.0 = DebugOpenssl|x64
 		{27B53E5C-ACAB-423C-854E-BECE56D73544}.Memento|Win32.ActiveCfg = Memento|Win32
 		{27B53E5C-ACAB-423C-854E-BECE56D73544}.Memento|Win32.Build.0 = Memento|Win32
 		{27B53E5C-ACAB-423C-854E-BECE56D73544}.Memento|x64.ActiveCfg = Memento|x64
-		{27B53E5C-ACAB-423C-854E-BECE56D73544}.Memento|x64.Build.0 = Memento|x64
 		{27B53E5C-ACAB-423C-854E-BECE56D73544}.Release|Win32.ActiveCfg = Release|Win32
 		{27B53E5C-ACAB-423C-854E-BECE56D73544}.Release|Win32.Build.0 = Release|Win32
 		{27B53E5C-ACAB-423C-854E-BECE56D73544}.Release|x64.ActiveCfg = Release|x64
-		{27B53E5C-ACAB-423C-854E-BECE56D73544}.Release|x64.Build.0 = Release|x64
+		{27B53E5C-ACAB-423C-854E-BECE56D73544}.ReleaseJava|Win32.ActiveCfg = ReleaseOpenssl|Win32
+		{27B53E5C-ACAB-423C-854E-BECE56D73544}.ReleaseJava|x64.ActiveCfg = ReleaseOpenssl|x64
 		{27B53E5C-ACAB-423C-854E-BECE56D73544}.ReleaseOpenssl|Win32.ActiveCfg = ReleaseOpenssl|Win32
 		{27B53E5C-ACAB-423C-854E-BECE56D73544}.ReleaseOpenssl|Win32.Build.0 = ReleaseOpenssl|Win32
 		{27B53E5C-ACAB-423C-854E-BECE56D73544}.ReleaseOpenssl|x64.ActiveCfg = ReleaseOpenssl|x64
-		{27B53E5C-ACAB-423C-854E-BECE56D73544}.ReleaseOpenssl|x64.Build.0 = ReleaseOpenssl|x64
 		{21E28758-E4D2-4B84-8EC5-B631CEE66B30}.Debug|Win32.ActiveCfg = Debug|Win32
 		{21E28758-E4D2-4B84-8EC5-B631CEE66B30}.Debug|Win32.Build.0 = Debug|Win32
 		{21E28758-E4D2-4B84-8EC5-B631CEE66B30}.Debug|x64.ActiveCfg = Debug|x64
@@ -281,6 +332,8 @@ Global
 		{21E28758-E4D2-4B84-8EC5-B631CEE66B30}.DebugGProof|Win32.ActiveCfg = Debug|Win32
 		{21E28758-E4D2-4B84-8EC5-B631CEE66B30}.DebugGProof|x64.ActiveCfg = DebugOpenssl|x64
 		{21E28758-E4D2-4B84-8EC5-B631CEE66B30}.DebugGProof|x64.Build.0 = DebugOpenssl|x64
+		{21E28758-E4D2-4B84-8EC5-B631CEE66B30}.DebugJava|Win32.ActiveCfg = Debug|Win32
+		{21E28758-E4D2-4B84-8EC5-B631CEE66B30}.DebugJava|x64.ActiveCfg = Debug|x64
 		{21E28758-E4D2-4B84-8EC5-B631CEE66B30}.DebugOpenssl|Win32.ActiveCfg = DebugOpenssl|Win32
 		{21E28758-E4D2-4B84-8EC5-B631CEE66B30}.DebugOpenssl|Win32.Build.0 = DebugOpenssl|Win32
 		{21E28758-E4D2-4B84-8EC5-B631CEE66B30}.DebugOpenssl|x64.ActiveCfg = DebugOpenssl|x64
@@ -293,6 +346,8 @@ Global
 		{21E28758-E4D2-4B84-8EC5-B631CEE66B30}.Release|Win32.Build.0 = Release|Win32
 		{21E28758-E4D2-4B84-8EC5-B631CEE66B30}.Release|x64.ActiveCfg = Release|x64
 		{21E28758-E4D2-4B84-8EC5-B631CEE66B30}.Release|x64.Build.0 = Release|x64
+		{21E28758-E4D2-4B84-8EC5-B631CEE66B30}.ReleaseJava|Win32.ActiveCfg = ReleaseOpenssl|Win32
+		{21E28758-E4D2-4B84-8EC5-B631CEE66B30}.ReleaseJava|x64.ActiveCfg = ReleaseOpenssl|x64
 		{21E28758-E4D2-4B84-8EC5-B631CEE66B30}.ReleaseOpenssl|Win32.ActiveCfg = ReleaseOpenssl|Win32
 		{21E28758-E4D2-4B84-8EC5-B631CEE66B30}.ReleaseOpenssl|Win32.Build.0 = ReleaseOpenssl|Win32
 		{21E28758-E4D2-4B84-8EC5-B631CEE66B30}.ReleaseOpenssl|x64.ActiveCfg = ReleaseOpenssl|x64
@@ -305,6 +360,8 @@ Global
 		{A1B75D29-9F5C-4A0F-B368-322A10477D0C}.DebugGProof|Win32.Build.0 = Debug|Win32
 		{A1B75D29-9F5C-4A0F-B368-322A10477D0C}.DebugGProof|x64.ActiveCfg = Debug|x64
 		{A1B75D29-9F5C-4A0F-B368-322A10477D0C}.DebugGProof|x64.Build.0 = Debug|x64
+		{A1B75D29-9F5C-4A0F-B368-322A10477D0C}.DebugJava|Win32.ActiveCfg = Debug|Win32
+		{A1B75D29-9F5C-4A0F-B368-322A10477D0C}.DebugJava|x64.ActiveCfg = Debug|x64
 		{A1B75D29-9F5C-4A0F-B368-322A10477D0C}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32
 		{A1B75D29-9F5C-4A0F-B368-322A10477D0C}.DebugOpenssl|Win32.Build.0 = Debug|Win32
 		{A1B75D29-9F5C-4A0F-B368-322A10477D0C}.DebugOpenssl|x64.ActiveCfg = Debug|x64
@@ -317,6 +374,8 @@ Global
 		{A1B75D29-9F5C-4A0F-B368-322A10477D0C}.Release|Win32.Build.0 = Release|Win32
 		{A1B75D29-9F5C-4A0F-B368-322A10477D0C}.Release|x64.ActiveCfg = Release|x64
 		{A1B75D29-9F5C-4A0F-B368-322A10477D0C}.Release|x64.Build.0 = Release|x64
+		{A1B75D29-9F5C-4A0F-B368-322A10477D0C}.ReleaseJava|Win32.ActiveCfg = Release|Win32
+		{A1B75D29-9F5C-4A0F-B368-322A10477D0C}.ReleaseJava|x64.ActiveCfg = Release|x64
 		{A1B75D29-9F5C-4A0F-B368-322A10477D0C}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32
 		{A1B75D29-9F5C-4A0F-B368-322A10477D0C}.ReleaseOpenssl|Win32.Build.0 = Release|Win32
 		{A1B75D29-9F5C-4A0F-B368-322A10477D0C}.ReleaseOpenssl|x64.ActiveCfg = Release|x64
@@ -328,6 +387,8 @@ Global
 		{CE3A76A8-A28F-4991-8FB9-C9453D922037}.DebugGProof|Win32.ActiveCfg = Debug|Win32
 		{CE3A76A8-A28F-4991-8FB9-C9453D922037}.DebugGProof|x64.ActiveCfg = Debug|x64
 		{CE3A76A8-A28F-4991-8FB9-C9453D922037}.DebugGProof|x64.Build.0 = Debug|x64
+		{CE3A76A8-A28F-4991-8FB9-C9453D922037}.DebugJava|Win32.ActiveCfg = Debug|Win32
+		{CE3A76A8-A28F-4991-8FB9-C9453D922037}.DebugJava|x64.ActiveCfg = Debug|x64
 		{CE3A76A8-A28F-4991-8FB9-C9453D922037}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32
 		{CE3A76A8-A28F-4991-8FB9-C9453D922037}.DebugOpenssl|Win32.Build.0 = Debug|Win32
 		{CE3A76A8-A28F-4991-8FB9-C9453D922037}.DebugOpenssl|x64.ActiveCfg = Debug|x64
@@ -340,28 +401,12 @@ Global
 		{CE3A76A8-A28F-4991-8FB9-C9453D922037}.Release|Win32.Build.0 = Release|Win32
 		{CE3A76A8-A28F-4991-8FB9-C9453D922037}.Release|x64.ActiveCfg = Release|x64
 		{CE3A76A8-A28F-4991-8FB9-C9453D922037}.Release|x64.Build.0 = Release|x64
+		{CE3A76A8-A28F-4991-8FB9-C9453D922037}.ReleaseJava|Win32.ActiveCfg = Release|Win32
+		{CE3A76A8-A28F-4991-8FB9-C9453D922037}.ReleaseJava|x64.ActiveCfg = Release|x64
 		{CE3A76A8-A28F-4991-8FB9-C9453D922037}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32
 		{CE3A76A8-A28F-4991-8FB9-C9453D922037}.ReleaseOpenssl|Win32.Build.0 = Release|Win32
 		{CE3A76A8-A28F-4991-8FB9-C9453D922037}.ReleaseOpenssl|x64.ActiveCfg = Release|x64
 		{CE3A76A8-A28F-4991-8FB9-C9453D922037}.ReleaseOpenssl|x64.Build.0 = Release|x64
-		{05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}.Debug|Win32.ActiveCfg = Debug|Win32
-		{05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}.Debug|Win32.Build.0 = Debug|Win32
-		{05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}.Debug|x64.ActiveCfg = Debug|Win32
-		{05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}.DebugGProof|Win32.ActiveCfg = Debug|Win32
-		{05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}.DebugGProof|Win32.Build.0 = Debug|Win32
-		{05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}.DebugGProof|x64.ActiveCfg = Debug|Win32
-		{05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32
-		{05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}.DebugOpenssl|Win32.Build.0 = Debug|Win32
-		{05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}.DebugOpenssl|x64.ActiveCfg = Debug|Win32
-		{05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}.Memento|Win32.ActiveCfg = Release|Win32
-		{05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}.Memento|Win32.Build.0 = Release|Win32
-		{05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}.Memento|x64.ActiveCfg = Release|Win32
-		{05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}.Release|Win32.ActiveCfg = Release|Win32
-		{05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}.Release|Win32.Build.0 = Release|Win32
-		{05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}.Release|x64.ActiveCfg = Release|Win32
-		{05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32
-		{05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}.ReleaseOpenssl|Win32.Build.0 = Release|Win32
-		{05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}.ReleaseOpenssl|x64.ActiveCfg = Release|Win32
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Debug|Win32.ActiveCfg = Debug|Win32
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Debug|Win32.Build.0 = Debug|Win32
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Debug|x64.ActiveCfg = Debug|x64
@@ -370,6 +415,10 @@ Global
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugGProof|Win32.Build.0 = Debug|Win32
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugGProof|x64.ActiveCfg = Debug|x64
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugGProof|x64.Build.0 = Debug|x64
+		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugJava|Win32.ActiveCfg = DebugJava|Win32
+		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugJava|Win32.Build.0 = DebugJava|Win32
+		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugJava|x64.ActiveCfg = DebugJava|x64
+		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugJava|x64.Build.0 = DebugJava|x64
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugOpenssl|Win32.Build.0 = Debug|Win32
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugOpenssl|x64.ActiveCfg = Debug|x64
@@ -382,6 +431,9 @@ Global
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Release|Win32.Build.0 = Release|Win32
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Release|x64.ActiveCfg = Release|x64
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Release|x64.Build.0 = Release|x64
+		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.ReleaseJava|Win32.ActiveCfg = ReleaseJava|Win32
+		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.ReleaseJava|x64.ActiveCfg = ReleaseJava|x64
+		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.ReleaseJava|x64.Build.0 = ReleaseJava|x64
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.ReleaseOpenssl|Win32.Build.0 = Release|Win32
 		{52DCAB29-C8EE-4422-954C-29AFA6B33E22}.ReleaseOpenssl|x64.ActiveCfg = Release|x64
@@ -393,6 +445,8 @@ Global
 		{0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.DebugGProof|Win32.ActiveCfg = Debug|Win32
 		{0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.DebugGProof|x64.ActiveCfg = Debug|x64
 		{0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.DebugGProof|x64.Build.0 = Debug|x64
+		{0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.DebugJava|Win32.ActiveCfg = Debug|Win32
+		{0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.DebugJava|x64.ActiveCfg = Debug|x64
 		{0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.DebugOpenssl|Win32.ActiveCfg = Debug|x64
 		{0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.DebugOpenssl|x64.ActiveCfg = Debug|x64
 		{0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.DebugOpenssl|x64.Build.0 = Debug|x64
@@ -404,9 +458,51 @@ Global
 		{0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.Release|Win32.Build.0 = Release|Win32
 		{0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.Release|x64.ActiveCfg = Release|x64
 		{0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.Release|x64.Build.0 = Release|x64
+		{0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.ReleaseJava|Win32.ActiveCfg = Release|Win32
+		{0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.ReleaseJava|x64.ActiveCfg = Release|x64
 		{0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.ReleaseOpenssl|Win32.ActiveCfg = Release|x64
 		{0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.ReleaseOpenssl|x64.ActiveCfg = Release|x64
 		{0FDC74D7-D18C-45CE-94D6-EDFCC5A0CDF2}.ReleaseOpenssl|x64.Build.0 = Release|x64
+		{3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.Debug|Win32.ActiveCfg = DebugJava|Win32
+		{3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.Debug|x64.ActiveCfg = DebugJava|Win32
+		{3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.DebugGProof|Win32.ActiveCfg = DebugJava|Win32
+		{3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.DebugGProof|x64.ActiveCfg = DebugJava|Win32
+		{3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.DebugJava|Win32.ActiveCfg = DebugJava|Win32
+		{3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.DebugJava|Win32.Build.0 = DebugJava|Win32
+		{3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.DebugJava|x64.ActiveCfg = DebugJava|x64
+		{3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.DebugJava|x64.Build.0 = DebugJava|x64
+		{3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.DebugOpenssl|Win32.ActiveCfg = DebugJava|Win32
+		{3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.DebugOpenssl|x64.ActiveCfg = DebugJava|Win32
+		{3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.Memento|Win32.ActiveCfg = DebugJava|Win32
+		{3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.Memento|x64.ActiveCfg = DebugJava|Win32
+		{3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.Release|Win32.ActiveCfg = ReleaseJava|Win32
+		{3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.Release|x64.ActiveCfg = ReleaseJava|Win32
+		{3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.ReleaseJava|Win32.ActiveCfg = ReleaseJava|Win32
+		{3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.ReleaseJava|Win32.Build.0 = ReleaseJava|Win32
+		{3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.ReleaseJava|x64.ActiveCfg = ReleaseJava|x64
+		{3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.ReleaseJava|x64.Build.0 = ReleaseJava|x64
+		{3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.ReleaseOpenssl|Win32.ActiveCfg = ReleaseJava|Win32
+		{3DB35F2D-9679-4DED-BA0C-240A4E6E6674}.ReleaseOpenssl|x64.ActiveCfg = ReleaseJava|Win32
+		{FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.Debug|Win32.ActiveCfg = DebugJava|Win32
+		{FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.Debug|x64.ActiveCfg = DebugJava|Win32
+		{FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.DebugGProof|Win32.ActiveCfg = DebugJava|Win32
+		{FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.DebugGProof|x64.ActiveCfg = DebugJava|Win32
+		{FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.DebugJava|Win32.ActiveCfg = DebugJava|Win32
+		{FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.DebugJava|Win32.Build.0 = DebugJava|Win32
+		{FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.DebugJava|x64.ActiveCfg = DebugJava|x64
+		{FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.DebugJava|x64.Build.0 = DebugJava|x64
+		{FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.DebugOpenssl|Win32.ActiveCfg = DebugJava|Win32
+		{FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.DebugOpenssl|x64.ActiveCfg = DebugJava|Win32
+		{FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.Memento|Win32.ActiveCfg = ReleaseJava|Win32
+		{FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.Memento|x64.ActiveCfg = ReleaseJava|Win32
+		{FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.Release|Win32.ActiveCfg = ReleaseJava|Win32
+		{FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.Release|x64.ActiveCfg = ReleaseJava|Win32
+		{FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.ReleaseJava|Win32.ActiveCfg = ReleaseJava|Win32
+		{FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.ReleaseJava|Win32.Build.0 = ReleaseJava|Win32
+		{FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.ReleaseJava|x64.ActiveCfg = ReleaseJava|x64
+		{FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.ReleaseJava|x64.Build.0 = ReleaseJava|x64
+		{FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.ReleaseOpenssl|Win32.ActiveCfg = ReleaseJava|Win32
+		{FB8DC595-90A5-44D6-9FFF-2BDFA912FD8C}.ReleaseOpenssl|x64.ActiveCfg = ReleaseJava|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE