Rejig VS projects to avoid compiling files twice.

We now have a libmupdf that has all the usual files in, plus a
libmupdf-v8 and a libmupdf-nov8 with/without javascript
respectively. libmupdf-v8 and libmupdf-nov8 both depend on libmupdf,
and the apps depend on libmupdf-{no,}v8 as appropriate.

This means every file is listed (and compiled) strictly once, and
better matches the style of the unix builds. It also prevents VS
getting confused and listing files twice in search results.

Also, we strip out the unnecessary repeated calls to generate.bat,
which result in occasional spurious build failures.

4 files changed, 243 insertions, 475 deletions

diff --git a/win32/libmupdf-nov8.vcproj b/win32/libmupdf-nov8.vcproj
new file mode 100644
index 00000000..489d9b2d
--- /dev/null
+++ b/win32/libmupdf-nov8.vcproj
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="libmupdf-nov8"
+	ProjectGUID="{EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}"
+	RootNamespace="mupdf"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				Description=""
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\scripts;..\fitz;..\pdf;..\thirdparty\jbig2dec;&quot;..\thirdparty\jpeg&quot;;&quot;..\thirdparty\openjpeg\libopenjpeg&quot;;&quot;..\thirdparty\zlib&quot;;&quot;..\thirdparty\freetype\include&quot;;&quot;..\thirdparty\v8-3.9\include&quot;"
+				PreprocessorDefinitions="DEBUG=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalLibraryDirectories=""
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|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"
+				AdditionalIncludeDirectories="..\scripts;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;&quot;..\thirdparty\v8-3.9\include&quot;"
+				RuntimeLibrary="0"
+				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="Memento|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;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;&quot;..\thirdparty\v8-3.9\include&quot;"
+				PreprocessorDefinitions="MEMENTO=1;DEBUG=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				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>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="pdf"
+			>
+			<File
+				RelativePath="..\pdf\pdf_js_none.c"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/libmupdf-v8.vcproj b/win32/libmupdf-v8.vcproj
index bd093b42..12a444f8 100644
--- a/win32/libmupdf-v8.vcproj
+++ b/win32/libmupdf-v8.vcproj
@@ -23,8 +23,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				Description="Generate CMap and Font source files"
-				CommandLine="generate.bat"
+				Description=""
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -211,82 +211,6 @@
 			Name="pdf"
 			>
 			<File
-				RelativePath="..\pdf\data_encodings.h"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\data_glyphlist.h"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\mupdf-internal.h"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\mupdf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_annot.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_cmap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_cmap_load.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_cmap_parse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_cmap_table.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_colorspace.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_crypt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_encoding.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_event.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_font.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_fontfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_form.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_function.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_image.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_interpret.c"
-				>
-			</File>
-			<File
 				RelativePath="..\pdf\pdf_js.c"
 				>
 			</File>
@@ -302,390 +226,6 @@
 				RelativePath="..\pdf\pdf_jsimp_v8.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\pdf\pdf_lex.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_metrics.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_nametree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_object.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_outline.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_page.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_parse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_pattern.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_repair.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_shade.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_store.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_stream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_type3.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_unicode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_write.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_xobject.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_xref.c"
-				>
-			</File>
-			<File
-				RelativePath="..\pdf\pdf_xref_aux.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="fitz"
-			>
-			<File
-				RelativePath="..\fitz\base_context.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\base_error.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\base_geometry.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\base_getopt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\base_hash.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\base_memory.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\base_string.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\base_time.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\crypt_sha2.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\dev_bbox.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\doc_document.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\doc_interactive.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\doc_link.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\doc_outline.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_flate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\filt_jbig2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\filt_lzwd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\filt_predict.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\fitz-internal.h"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\fitz.h"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\image_jpeg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\image_jpx.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\image_md5.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\image_png.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\image_save.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\image_tiff.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\memento.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\memento.h"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\res_bitmap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\res_colorspace.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\res_font.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\res_halftone.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_store.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\res_text.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\stm_buffer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\stm_open.c"
-				>
-			</File>
-			<File
-				RelativePath="..\fitz\stm_read.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="draw"
-			>
-			<File
-				RelativePath="..\draw\draw_affine.c"
-				>
-			</File>
-			<File
-				RelativePath="..\draw\draw_blend.c"
-				>
-			</File>
-			<File
-				RelativePath="..\draw\draw_device.c"
-				>
-			</File>
-			<File
-				RelativePath="..\draw\draw_edge.c"
-				>
-			</File>
-			<File
-				RelativePath="..\draw\draw_glyph.c"
-				>
-			</File>
-			<File
-				RelativePath="..\draw\draw_mesh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\draw\draw_paint.c"
-				>
-			</File>
-			<File
-				RelativePath="..\draw\draw_path.c"
-				>
-			</File>
-			<File
-				RelativePath="..\draw\draw_simple_scale.c"
-				>
-			</File>
-			<File
-				RelativePath="..\draw\draw_unpack.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="xps"
-			>
-			<File
-				RelativePath="..\xps\muxps.h"
-				>
-			</File>
-			<File
-				RelativePath="..\xps\xps_common.c"
-				>
-			</File>
-			<File
-				RelativePath="..\xps\xps_doc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\xps\xps_glyphs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\xps\xps_gradient.c"
-				>
-			</File>
-			<File
-				RelativePath="..\xps\xps_image.c"
-				>
-			</File>
-			<File
-				RelativePath="..\xps\xps_outline.c"
-				>
-			</File>
-			<File
-				RelativePath="..\xps\xps_path.c"
-				>
-			</File>
-			<File
-				RelativePath="..\xps\xps_resource.c"
-				>
-			</File>
-			<File
-				RelativePath="..\xps\xps_tile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\xps\xps_util.c"
-				>
-			</File>
-			<File
-				RelativePath="..\xps\xps_zip.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="cbz"
-			>
-			<File
-				RelativePath="..\cbz\mucbz.c"
-				>
-			</File>
-			<File
-				RelativePath="..\cbz\mucbz.h"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/win32/libmupdf.vcproj b/win32/libmupdf.vcproj
index 1195ccee..b22fb8ca 100644
--- a/win32/libmupdf.vcproj
+++ b/win32/libmupdf.vcproj
@@ -23,8 +23,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				Description="Generate CMap and Font source files"
-				CommandLine="generate.bat"
+				Description=""
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -286,10 +286,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\pdf\pdf_js_none.c"
-				>
-			</File>
-			<File
 				RelativePath="..\pdf\pdf_lex.c"
 				>
 			</File>
diff --git a/win32/mupdf.sln b/win32/mupdf.sln
index bd145d31..09a8023a 100644
--- a/win32/mupdf.sln
+++ b/win32/mupdf.sln
@@ -3,7 +3,7 @@ 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}
+		{EC81A9F3-88A6-4170-B7B4-C41CB789A7F6} = {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}
 		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
 	EndProjectSection
 EndProject
@@ -16,14 +16,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmupdf", "libmupdf.vcproj
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mudraw", "mudraw.vcproj", "{0B51171B-B10E-4EAC-8FFA-19226A1828A3}"
 	ProjectSection(ProjectDependencies) = postProject
-		{A5053AA7-02E5-4903-B596-04F17AEB1526} = {A5053AA7-02E5-4903-B596-04F17AEB1526}
-		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
+		{EC81A9F3-88A6-4170-B7B4-C41CB789A7F6} = {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}
 		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
+		{A5053AA7-02E5-4903-B596-04F17AEB1526} = {A5053AA7-02E5-4903-B596-04F17AEB1526}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mutool", "mutool.vcproj", "{00811970-815B-4F64-BC9D-219078B1F3AA}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
+		{EC81A9F3-88A6-4170-B7B4-C41CB789A7F6} = {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}
 		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
 	EndProjectSection
 EndProject
@@ -31,20 +31,25 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generated", "generated.vcpr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmupdf-v8", "libmupdf-v8.vcproj", "{2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
 		{A5053AA7-02E5-4903-B596-04F17AEB1526} = {A5053AA7-02E5-4903-B596-04F17AEB1526}
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdf-v8", "mupdf-v8.vcproj", "{9035A4F3-4219-45A5-985D-FBF4D9609713}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2E5DAFDB-A060-4011-B760-32F6A3A4BC9D} = {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}
 		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
+		{2E5DAFDB-A060-4011-B760-32F6A3A4BC9D} = {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mujstest-v8", "mujstest-v8.vcproj", "{21E28758-E4D2-4B84-8EC5-B631CEE66B30}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
 		{2E5DAFDB-A060-4011-B760-32F6A3A4BC9D} = {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}
+		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmupdf-nov8", "libmupdf-nov8.vcproj", "{EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
 	EndProjectSection
 EndProject
 Global
@@ -108,6 +113,12 @@ Global
 		{21E28758-E4D2-4B84-8EC5-B631CEE66B30}.Memento|Win32.Build.0 = Memento|Win32
 		{21E28758-E4D2-4B84-8EC5-B631CEE66B30}.Release|Win32.ActiveCfg = Release|Win32
 		{21E28758-E4D2-4B84-8EC5-B631CEE66B30}.Release|Win32.Build.0 = Release|Win32
+		{EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.Debug|Win32.Build.0 = Debug|Win32
+		{EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.Memento|Win32.ActiveCfg = Memento|Win32
+		{EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.Memento|Win32.Build.0 = Memento|Win32
+		{EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.Release|Win32.ActiveCfg = Release|Win32
+		{EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE