From d7e5105b02438e873c8f052a9d48d40de3254c17 Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor@ghostscript.com>
Date: Fri, 2 Jul 2010 16:19:34 +0200
Subject: Rearrange MSVC projects.

---
 win32/draw/draw.vcproj                 | 199 ------------------
 win32/fitz/fitz.vcproj                 | 359 ---------------------------------
 win32/jbig2dec/jbig2dec.vcproj         |   4 +-
 win32/jpeg/jpeg.vcproj                 |   2 +-
 win32/libopenjpeg/libopenjpeg.vcproj   | 319 +++++++++++++++++++++++++++++
 win32/mupdf.sln                        |  84 +++-----
 win32/mupdf/mupdf.vcproj               | 270 ++++++++++++++++++++++++-
 win32/mupdf_viewer/mupdf_viewer.vcproj |   2 +
 8 files changed, 618 insertions(+), 621 deletions(-)
 delete mode 100644 win32/draw/draw.vcproj
 delete mode 100644 win32/fitz/fitz.vcproj
 create mode 100644 win32/libopenjpeg/libopenjpeg.vcproj

diff --git a/win32/draw/draw.vcproj b/win32/draw/draw.vcproj
deleted file mode 100644
index edfb2b75..00000000
--- a/win32/draw/draw.vcproj
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="draw"
-	ProjectGUID="{B664D05B-CF78-423A-B1E7-5E84FD939580}"
-	RootNamespace="draw"
-	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"
-				AdditionalIncludeDirectories="..\..\fitz"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(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"
-				AdditionalIncludeDirectories="..\..\fitz"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="draw"
-			>
-			<File
-				RelativePath="..\..\draw\archport.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\draw\archx86.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\draw\blendmodes.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\draw\glyphcache.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\draw\imagedraw.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\draw\imagescale.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\draw\imageunpack.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\draw\meshdraw.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\draw\pathfill.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\draw\pathscan.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\draw\pathstroke.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\draw\porterduff.c"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/fitz/fitz.vcproj b/win32/fitz/fitz.vcproj
deleted file mode 100644
index 29dec0a8..00000000
--- a/win32/fitz/fitz.vcproj
+++ /dev/null
@@ -1,359 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="fitz"
-	ProjectGUID="{1CB1FEC2-6D06-4B82-9D0D-0E92303285C8}"
-	RootNamespace="fitz"
-	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"
-				AdditionalIncludeDirectories="..\..\thirdparty\freetype\include;..\..\thirdparty\jpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\mupdf"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(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"
-				AdditionalIncludeDirectories="..\..\thirdparty\freetype\include;..\..\thirdparty\jpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\mupdf"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="fitz"
-			>
-			<File
-				RelativePath="..\..\fitz\base_cpudep.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\base_error.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\base_hash.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\base_matrix.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\base_memory.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\base_rect.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\base_string.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\base_unicode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\crypt_aes.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\crypt_arc4.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\crypt_md5.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\dev_bbox.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\dev_draw.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\dev_list.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\dev_null.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\dev_text.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\dev_trace.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\filt_aesd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\filt_arc4.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\filt_basic.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\filt_dctd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\filt_faxd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\filt_faxd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\filt_faxdtab.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\filt_flate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\filt_jbig2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\filt_jpxd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\filt_lzwd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\filt_pipeline.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\filt_predict.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\fitz.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\fitz_base.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\fitz_draw.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\fitz_res.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\fitz_stream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\obj_array.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\obj_dict.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\obj_print.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\obj_simple.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\res_colorspace.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\res_font.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\res_path.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\res_pixmap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\res_shade.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\res_text.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\stm_buffer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\stm_filter.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\stm_misc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\stm_open.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\stm_read.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\util_getopt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\fitz\util_gettimeofday.c"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/jbig2dec/jbig2dec.vcproj b/win32/jbig2dec/jbig2dec.vcproj
index 872c4ec7..a5cdac0e 100644
--- a/win32/jbig2dec/jbig2dec.vcproj
+++ b/win32/jbig2dec/jbig2dec.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="jbig2dec"
+	Name="libjbig2dec"
 	ProjectGUID="{46F9218B-7A3F-481F-B971-E93547C2643B}"
-	RootNamespace="jbig2dec"
+	RootNamespace="libjbig2dec"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
diff --git a/win32/jpeg/jpeg.vcproj b/win32/jpeg/jpeg.vcproj
index 26f7149d..c070fec5 100644
--- a/win32/jpeg/jpeg.vcproj
+++ b/win32/jpeg/jpeg.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="jpeg"
+	Name="libjpeg"
 	ProjectGUID="{A738D37E-F4E2-4ACC-A086-14149E3B6639}"
 	RootNamespace="jpeg"
 	Keyword="Win32Proj"
diff --git a/win32/libopenjpeg/libopenjpeg.vcproj b/win32/libopenjpeg/libopenjpeg.vcproj
new file mode 100644
index 00000000..a3db8c21
--- /dev/null
+++ b/win32/libopenjpeg/libopenjpeg.vcproj
@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="libopenjpeg"
+	ProjectGUID="{4F27AA53-4181-4A1A-8238-3931B0A41048}"
+	RootNamespace="libopenjpeg"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OPJ_STATIC;_CRT_SECURE_NO_DEPRECATE"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;OPJ_STATIC;_CRT_SECURE_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				SuppressStartupBanner="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>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="libopenjpeg"
+			>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\bio.c"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\cio.c"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\dwt.c"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\event.c"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\image.c"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\j2k.c"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\j2k_lib.c"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\jp2.c"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\jpt.c"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\mct.c"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\mqc.c"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\openjpeg.c"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\pi.c"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\raw.c"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\t1.c"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\t2.c"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\tcd.c"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\tgt.c"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\bio.h"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\cio.h"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\dwt.h"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\event.h"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\fix.h"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\image.h"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\int.h"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\j2k.h"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\j2k_lib.h"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\jp2.h"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\jpt.h"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\mct.h"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\mqc.h"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\openjpeg.h"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\opj_includes.h"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\opj_malloc.h"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\pi.h"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\raw.h"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\t1.h"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\t1_luts.h"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\t2.h"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\tcd.h"
+				>
+			</File>
+			<File
+				RelativePath="../../thirdparty/openjpeg/libopenjpeg\tgt.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/mupdf.sln b/win32/mupdf.sln
index db4b7e73..f370dd44 100644
--- a/win32/mupdf.sln
+++ b/win32/mupdf.sln
@@ -1,92 +1,73 @@
 
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fitz", "fitz\fitz.vcproj", "{1CB1FEC2-6D06-4B82-9D0D-0E92303285C8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfreetype", "..\thirdparty\freetype\builds\win32\vc2005\freetype.vcproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "..\thirdparty\freetype\builds\win32\vc2005\freetype.vcproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg", "jpeg\jpeg.vcproj", "{A738D37E-F4E2-4ACC-A086-14149E3B6639}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg", "jpeg\jpeg.vcproj", "{A738D37E-F4E2-4ACC-A086-14149E3B6639}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openjpeg", "..\thirdparty\openjpeg\LibOpenJPEG.vcproj", "{4F27AA53-4181-4A1A-8238-3931B0A41048}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "draw", "draw\draw.vcproj", "{B664D05B-CF78-423A-B1E7-5E84FD939580}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdf", "mupdf\mupdf.vcproj", "{20F22284-C947-4F7E-91DD-12077B8DA775}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmupdf", "mupdf\mupdf.vcproj", "{20F22284-C947-4F7E-91DD-12077B8DA775}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdfshow", "pdfshow\pdfshow.vcproj", "{15045856-8693-487D-A3F4-D8D23C55F11F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A40AEB27-EF39-4966-9AD3-88C78DE88907} = {A40AEB27-EF39-4966-9AD3-88C78DE88907}
-		{B664D05B-CF78-423A-B1E7-5E84FD939580} = {B664D05B-CF78-423A-B1E7-5E84FD939580}
-		{46F9218B-7A3F-481F-B971-E93547C2643B} = {46F9218B-7A3F-481F-B971-E93547C2643B}
-		{62E2A7C0-F3F1-4A82-A856-A67770EBDBFF} = {62E2A7C0-F3F1-4A82-A856-A67770EBDBFF}
-		{0782B20B-C570-4CD3-A33C-FC9D2A31BCA1} = {0782B20B-C570-4CD3-A33C-FC9D2A31BCA1}
 		{4F27AA53-4181-4A1A-8238-3931B0A41048} = {4F27AA53-4181-4A1A-8238-3931B0A41048}
 		{A738D37E-F4E2-4ACC-A086-14149E3B6639} = {A738D37E-F4E2-4ACC-A086-14149E3B6639}
 		{20F22284-C947-4F7E-91DD-12077B8DA775} = {20F22284-C947-4F7E-91DD-12077B8DA775}
+		{46F9218B-7A3F-481F-B971-E93547C2643B} = {46F9218B-7A3F-481F-B971-E93547C2643B}
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
-		{1CB1FEC2-6D06-4B82-9D0D-0E92303285C8} = {1CB1FEC2-6D06-4B82-9D0D-0E92303285C8}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jbig2dec", "jbig2dec\jbig2dec.vcproj", "{46F9218B-7A3F-481F-B971-E93547C2643B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjbig2dec", "jbig2dec\jbig2dec.vcproj", "{46F9218B-7A3F-481F-B971-E93547C2643B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdfclean", "pdfclean\pdfclean.vcproj", "{BCBFDF08-B206-4BB2-91A4-0EF2341A36BB}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A40AEB27-EF39-4966-9AD3-88C78DE88907} = {A40AEB27-EF39-4966-9AD3-88C78DE88907}
-		{B664D05B-CF78-423A-B1E7-5E84FD939580} = {B664D05B-CF78-423A-B1E7-5E84FD939580}
 		{4F27AA53-4181-4A1A-8238-3931B0A41048} = {4F27AA53-4181-4A1A-8238-3931B0A41048}
 		{A738D37E-F4E2-4ACC-A086-14149E3B6639} = {A738D37E-F4E2-4ACC-A086-14149E3B6639}
 		{20F22284-C947-4F7E-91DD-12077B8DA775} = {20F22284-C947-4F7E-91DD-12077B8DA775}
 		{46F9218B-7A3F-481F-B971-E93547C2643B} = {46F9218B-7A3F-481F-B971-E93547C2643B}
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
-		{1CB1FEC2-6D06-4B82-9D0D-0E92303285C8} = {1CB1FEC2-6D06-4B82-9D0D-0E92303285C8}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdfdraw", "pdfdraw\pdfdraw.vcproj", "{9AE57DFB-5D04-4F14-A6EE-4DB7D7A8EB1C}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1CB1FEC2-6D06-4B82-9D0D-0E92303285C8} = {1CB1FEC2-6D06-4B82-9D0D-0E92303285C8}
-		{62E2A7C0-F3F1-4A82-A856-A67770EBDBFF} = {62E2A7C0-F3F1-4A82-A856-A67770EBDBFF}
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
-		{46F9218B-7A3F-481F-B971-E93547C2643B} = {46F9218B-7A3F-481F-B971-E93547C2643B}
-		{20F22284-C947-4F7E-91DD-12077B8DA775} = {20F22284-C947-4F7E-91DD-12077B8DA775}
-		{A738D37E-F4E2-4ACC-A086-14149E3B6639} = {A738D37E-F4E2-4ACC-A086-14149E3B6639}
-		{4F27AA53-4181-4A1A-8238-3931B0A41048} = {4F27AA53-4181-4A1A-8238-3931B0A41048}
-		{B664D05B-CF78-423A-B1E7-5E84FD939580} = {B664D05B-CF78-423A-B1E7-5E84FD939580}
 		{0782B20B-C570-4CD3-A33C-FC9D2A31BCA1} = {0782B20B-C570-4CD3-A33C-FC9D2A31BCA1}
 		{A40AEB27-EF39-4966-9AD3-88C78DE88907} = {A40AEB27-EF39-4966-9AD3-88C78DE88907}
+		{4F27AA53-4181-4A1A-8238-3931B0A41048} = {4F27AA53-4181-4A1A-8238-3931B0A41048}
+		{A738D37E-F4E2-4ACC-A086-14149E3B6639} = {A738D37E-F4E2-4ACC-A086-14149E3B6639}
+		{20F22284-C947-4F7E-91DD-12077B8DA775} = {20F22284-C947-4F7E-91DD-12077B8DA775}
+		{46F9218B-7A3F-481F-B971-E93547C2643B} = {46F9218B-7A3F-481F-B971-E93547C2643B}
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
+		{62E2A7C0-F3F1-4A82-A856-A67770EBDBFF} = {62E2A7C0-F3F1-4A82-A856-A67770EBDBFF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdfextract", "pdfextract\pdfextract.vcproj", "{D4CF6DEE-20DE-44C2-AF6F-EFF0A524F33C}"
 	ProjectSection(ProjectDependencies) = postProject
-		{A40AEB27-EF39-4966-9AD3-88C78DE88907} = {A40AEB27-EF39-4966-9AD3-88C78DE88907}
-		{62E2A7C0-F3F1-4A82-A856-A67770EBDBFF} = {62E2A7C0-F3F1-4A82-A856-A67770EBDBFF}
 		{0782B20B-C570-4CD3-A33C-FC9D2A31BCA1} = {0782B20B-C570-4CD3-A33C-FC9D2A31BCA1}
-		{B664D05B-CF78-423A-B1E7-5E84FD939580} = {B664D05B-CF78-423A-B1E7-5E84FD939580}
+		{A40AEB27-EF39-4966-9AD3-88C78DE88907} = {A40AEB27-EF39-4966-9AD3-88C78DE88907}
 		{4F27AA53-4181-4A1A-8238-3931B0A41048} = {4F27AA53-4181-4A1A-8238-3931B0A41048}
 		{A738D37E-F4E2-4ACC-A086-14149E3B6639} = {A738D37E-F4E2-4ACC-A086-14149E3B6639}
 		{20F22284-C947-4F7E-91DD-12077B8DA775} = {20F22284-C947-4F7E-91DD-12077B8DA775}
 		{46F9218B-7A3F-481F-B971-E93547C2643B} = {46F9218B-7A3F-481F-B971-E93547C2643B}
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
-		{1CB1FEC2-6D06-4B82-9D0D-0E92303285C8} = {1CB1FEC2-6D06-4B82-9D0D-0E92303285C8}
+		{62E2A7C0-F3F1-4A82-A856-A67770EBDBFF} = {62E2A7C0-F3F1-4A82-A856-A67770EBDBFF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdfinfo", "pdfinfo\pdfinfo.vcproj", "{11249F33-4CF0-427D-AE1C-C1972DDC430C}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1CB1FEC2-6D06-4B82-9D0D-0E92303285C8} = {1CB1FEC2-6D06-4B82-9D0D-0E92303285C8}
-		{46F9218B-7A3F-481F-B971-E93547C2643B} = {46F9218B-7A3F-481F-B971-E93547C2643B}
-		{20F22284-C947-4F7E-91DD-12077B8DA775} = {20F22284-C947-4F7E-91DD-12077B8DA775}
-		{A738D37E-F4E2-4ACC-A086-14149E3B6639} = {A738D37E-F4E2-4ACC-A086-14149E3B6639}
-		{4F27AA53-4181-4A1A-8238-3931B0A41048} = {4F27AA53-4181-4A1A-8238-3931B0A41048}
-		{B664D05B-CF78-423A-B1E7-5E84FD939580} = {B664D05B-CF78-423A-B1E7-5E84FD939580}
 		{0782B20B-C570-4CD3-A33C-FC9D2A31BCA1} = {0782B20B-C570-4CD3-A33C-FC9D2A31BCA1}
-		{62E2A7C0-F3F1-4A82-A856-A67770EBDBFF} = {62E2A7C0-F3F1-4A82-A856-A67770EBDBFF}
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
 		{A40AEB27-EF39-4966-9AD3-88C78DE88907} = {A40AEB27-EF39-4966-9AD3-88C78DE88907}
+		{4F27AA53-4181-4A1A-8238-3931B0A41048} = {4F27AA53-4181-4A1A-8238-3931B0A41048}
+		{A738D37E-F4E2-4ACC-A086-14149E3B6639} = {A738D37E-F4E2-4ACC-A086-14149E3B6639}
+		{20F22284-C947-4F7E-91DD-12077B8DA775} = {20F22284-C947-4F7E-91DD-12077B8DA775}
+		{46F9218B-7A3F-481F-B971-E93547C2643B} = {46F9218B-7A3F-481F-B971-E93547C2643B}
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
+		{62E2A7C0-F3F1-4A82-A856-A67770EBDBFF} = {62E2A7C0-F3F1-4A82-A856-A67770EBDBFF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fontdump", "fontdump\fontdump.vcproj", "{4EC4D9C9-7490-4B35-A17C-EC9D28F488C3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{20F22284-C947-4F7E-91DD-12077B8DA775} = {20F22284-C947-4F7E-91DD-12077B8DA775}
-		{1CB1FEC2-6D06-4B82-9D0D-0E92303285C8} = {1CB1FEC2-6D06-4B82-9D0D-0E92303285C8}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fonts", "fonts\fonts.vcproj", "{62E2A7C0-F3F1-4A82-A856-A67770EBDBFF}"
@@ -101,24 +82,21 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmaps", "cmaps\cmaps.vcproj
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdf_viewer", "mupdf_viewer\mupdf_viewer.vcproj", "{C333416F-DC95-4A7D-92DF-565A7C57F82D}"
 	ProjectSection(ProjectDependencies) = postProject
-		{B664D05B-CF78-423A-B1E7-5E84FD939580} = {B664D05B-CF78-423A-B1E7-5E84FD939580}
+		{0782B20B-C570-4CD3-A33C-FC9D2A31BCA1} = {0782B20B-C570-4CD3-A33C-FC9D2A31BCA1}
+		{A40AEB27-EF39-4966-9AD3-88C78DE88907} = {A40AEB27-EF39-4966-9AD3-88C78DE88907}
 		{4F27AA53-4181-4A1A-8238-3931B0A41048} = {4F27AA53-4181-4A1A-8238-3931B0A41048}
 		{A738D37E-F4E2-4ACC-A086-14149E3B6639} = {A738D37E-F4E2-4ACC-A086-14149E3B6639}
 		{20F22284-C947-4F7E-91DD-12077B8DA775} = {20F22284-C947-4F7E-91DD-12077B8DA775}
 		{46F9218B-7A3F-481F-B971-E93547C2643B} = {46F9218B-7A3F-481F-B971-E93547C2643B}
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
 		{62E2A7C0-F3F1-4A82-A856-A67770EBDBFF} = {62E2A7C0-F3F1-4A82-A856-A67770EBDBFF}
-		{1CB1FEC2-6D06-4B82-9D0D-0E92303285C8} = {1CB1FEC2-6D06-4B82-9D0D-0E92303285C8}
-		{A40AEB27-EF39-4966-9AD3-88C78DE88907} = {A40AEB27-EF39-4966-9AD3-88C78DE88907}
-		{0782B20B-C570-4CD3-A33C-FC9D2A31BCA1} = {0782B20B-C570-4CD3-A33C-FC9D2A31BCA1}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib\zlib.vcproj", "{A40AEB27-EF39-4966-9AD3-88C78DE88907}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmapdump", "cmapdump\cmapdump.vcproj", "{FC75D9D8-3637-4409-84EE-46F3CB94BA6F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1CB1FEC2-6D06-4B82-9D0D-0E92303285C8} = {1CB1FEC2-6D06-4B82-9D0D-0E92303285C8}
-	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenjpeg", "libopenjpeg\libopenjpeg.vcproj", "{4F27AA53-4181-4A1A-8238-3931B0A41048}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -126,10 +104,6 @@ Global
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1CB1FEC2-6D06-4B82-9D0D-0E92303285C8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1CB1FEC2-6D06-4B82-9D0D-0E92303285C8}.Debug|Win32.Build.0 = Debug|Win32
-		{1CB1FEC2-6D06-4B82-9D0D-0E92303285C8}.Release|Win32.ActiveCfg = Release|Win32
-		{1CB1FEC2-6D06-4B82-9D0D-0E92303285C8}.Release|Win32.Build.0 = Release|Win32
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.Build.0 = Debug|Win32
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.ActiveCfg = Release|Win32
@@ -138,14 +112,6 @@ Global
 		{A738D37E-F4E2-4ACC-A086-14149E3B6639}.Debug|Win32.Build.0 = Debug|Win32
 		{A738D37E-F4E2-4ACC-A086-14149E3B6639}.Release|Win32.ActiveCfg = Release|Win32
 		{A738D37E-F4E2-4ACC-A086-14149E3B6639}.Release|Win32.Build.0 = Release|Win32
-		{4F27AA53-4181-4A1A-8238-3931B0A41048}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4F27AA53-4181-4A1A-8238-3931B0A41048}.Debug|Win32.Build.0 = Debug|Win32
-		{4F27AA53-4181-4A1A-8238-3931B0A41048}.Release|Win32.ActiveCfg = Release|Win32
-		{4F27AA53-4181-4A1A-8238-3931B0A41048}.Release|Win32.Build.0 = Release|Win32
-		{B664D05B-CF78-423A-B1E7-5E84FD939580}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B664D05B-CF78-423A-B1E7-5E84FD939580}.Debug|Win32.Build.0 = Debug|Win32
-		{B664D05B-CF78-423A-B1E7-5E84FD939580}.Release|Win32.ActiveCfg = Release|Win32
-		{B664D05B-CF78-423A-B1E7-5E84FD939580}.Release|Win32.Build.0 = Release|Win32
 		{20F22284-C947-4F7E-91DD-12077B8DA775}.Debug|Win32.ActiveCfg = Debug|Win32
 		{20F22284-C947-4F7E-91DD-12077B8DA775}.Debug|Win32.Build.0 = Debug|Win32
 		{20F22284-C947-4F7E-91DD-12077B8DA775}.Release|Win32.ActiveCfg = Release|Win32
@@ -198,6 +164,10 @@ Global
 		{FC75D9D8-3637-4409-84EE-46F3CB94BA6F}.Debug|Win32.Build.0 = Debug|Win32
 		{FC75D9D8-3637-4409-84EE-46F3CB94BA6F}.Release|Win32.ActiveCfg = Release|Win32
 		{FC75D9D8-3637-4409-84EE-46F3CB94BA6F}.Release|Win32.Build.0 = Release|Win32
+		{4F27AA53-4181-4A1A-8238-3931B0A41048}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4F27AA53-4181-4A1A-8238-3931B0A41048}.Debug|Win32.Build.0 = Debug|Win32
+		{4F27AA53-4181-4A1A-8238-3931B0A41048}.Release|Win32.ActiveCfg = Release|Win32
+		{4F27AA53-4181-4A1A-8238-3931B0A41048}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/win32/mupdf/mupdf.vcproj b/win32/mupdf/mupdf.vcproj
index fd48e5f1..488f913c 100644
--- a/win32/mupdf/mupdf.vcproj
+++ b/win32/mupdf/mupdf.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="mupdf"
+	Name="libmupdf"
 	ProjectGUID="{20F22284-C947-4F7E-91DD-12077B8DA775}"
 	RootNamespace="mupdf"
 	Keyword="Win32Proj"
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\fitz;..\..\thirdparty\freetype\include"
+				AdditionalIncludeDirectories="..\..\thirdparty\freetype\include;..\..\thirdparty\jpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\mupdf;..\..\fitz"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -102,7 +102,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\fitz;..\..\thirdparty\freetype\include"
+				AdditionalIncludeDirectories="..\..\thirdparty\freetype\include;..\..\thirdparty\jpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\mupdf;..\..\fitz"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -281,6 +281,270 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="fitz"
+			>
+			<File
+				RelativePath="..\..\fitz\base_cpudep.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\base_error.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\base_hash.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\base_matrix.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\base_memory.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\base_rect.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\base_string.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\base_unicode.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\crypt_aes.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\crypt_arc4.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\crypt_md5.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\dev_bbox.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\dev_draw.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\dev_list.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\dev_null.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\dev_text.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\dev_trace.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\filt_aesd.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\filt_arc4.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\filt_basic.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\filt_dctd.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\filt_faxd.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\filt_faxd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\filt_faxdtab.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\filt_flate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\filt_jbig2d.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\filt_jpxd.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\filt_lzwd.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\filt_pipeline.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\filt_predict.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\fitz.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\fitz_base.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\fitz_draw.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\fitz_res.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\fitz_stream.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\obj_array.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\obj_dict.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\obj_print.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\obj_simple.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\res_colorspace.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\res_font.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\res_path.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\res_pixmap.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\res_shade.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\res_text.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\stm_buffer.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\stm_filter.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\stm_misc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\stm_open.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\stm_read.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\util_getopt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\fitz\util_gettimeofday.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="draw"
+			>
+			<File
+				RelativePath="..\..\draw\archport.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\draw\archx86.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\draw\blendmodes.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\draw\glyphcache.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\draw\imagedraw.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\draw\imagescale.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\draw\imageunpack.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\draw\meshdraw.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\draw\pathfill.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\draw\pathscan.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\draw\pathstroke.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\draw\porterduff.c"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/win32/mupdf_viewer/mupdf_viewer.vcproj b/win32/mupdf_viewer/mupdf_viewer.vcproj
index 758a47c7..e18f716d 100644
--- a/win32/mupdf_viewer/mupdf_viewer.vcproj
+++ b/win32/mupdf_viewer/mupdf_viewer.vcproj
@@ -60,6 +60,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\mupdf.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="libcmtd"
 				GenerateDebugInformation="true"
@@ -134,6 +135,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\mupdf.exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames="libcmt"
 				GenerateDebugInformation="true"
-- 
cgit v1.2.3