Fix win32 project files.

9 files changed, 34 insertions, 34 deletions

diff --git a/win32/generate.bat b/win32/generate.bat
index 6ee830f0..38795430 100644
--- a/win32/generate.bat
+++ b/win32/generate.bat
@@ -3,10 +3,10 @@
 if not exist scripts/fontdump.c cd ..
 if not exist generated mkdir generated
 
-cl /nologo -Ifitz -Ipdf scripts/fontdump.c
-cl /nologo -Ifitz -Ipdf scripts/cmapdump.c
-cl /nologo -Ifitz -Ipdf scripts/cquote.c
-cl /nologo -Ifitz -Ipdf scripts/bin2hex.c
+cl /nologo -Iinclude scripts/fontdump.c
+cl /nologo -Iinclude scripts/cmapdump.c
+cl /nologo -Iinclude scripts/cquote.c
+cl /nologo -Iinclude scripts/bin2hex.c
 
 if not exist fontdump.exe goto usage
 if not exist cmapdump.exe goto usage
diff --git a/win32/libmupdf-nov8.vcproj b/win32/libmupdf-nov8.vcproj
index 45f6d2e2..108b82a5 100644
--- a/win32/libmupdf-nov8.vcproj
+++ b/win32/libmupdf-nov8.vcproj
@@ -40,7 +40,7 @@
 			<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;"
+				AdditionalIncludeDirectories="..\scripts;..\include;..\generated;..\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"
@@ -106,7 +106,7 @@
 				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;"
+				AdditionalIncludeDirectories="..\scripts;..\include;..\generated;..\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"
@@ -166,7 +166,7 @@
 			<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;"
+				AdditionalIncludeDirectories="..\scripts;..\include;..\generated;..\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"
diff --git a/win32/libmupdf-v8.vcproj b/win32/libmupdf-v8.vcproj
index 8adf5094..36b6ccd8 100644
--- a/win32/libmupdf-v8.vcproj
+++ b/win32/libmupdf-v8.vcproj
@@ -40,7 +40,7 @@
 			<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;"
+				AdditionalIncludeDirectories="..\scripts;..\include;..\generated;..\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"
@@ -106,7 +106,7 @@
 				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;"
+				AdditionalIncludeDirectories="..\scripts;..\include;..\generated;..\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"
@@ -166,7 +166,7 @@
 			<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;"
+				AdditionalIncludeDirectories="..\scripts;..\include;..\generated;..\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"
diff --git a/win32/libmupdf.vcproj b/win32/libmupdf.vcproj
index 016e345f..ba55e7c4 100644
--- a/win32/libmupdf.vcproj
+++ b/win32/libmupdf.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\scripts;..\fitz;..\ucdn;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include"
+				AdditionalIncludeDirectories="..\scripts;..\include;..\ucdn;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include"
 				PreprocessorDefinitions="DEBUG=1"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -105,7 +105,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\scripts;..\fitz;..\ucdn;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include"
+				AdditionalIncludeDirectories="..\scripts;..\include;..\ucdn;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
@@ -165,7 +165,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\scripts;..\fitz;..\ucdn;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include"
+				AdditionalIncludeDirectories="..\scripts;..\include;..\ucdn;..\generated;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include"
 				PreprocessorDefinitions="MEMENTO=1;DEBUG=1"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
diff --git a/win32/mudraw.vcproj b/win32/mudraw.vcproj
index 81cb8c86..6310fb06 100644
--- a/win32/mudraw.vcproj
+++ b/win32/mudraw.vcproj
@@ -39,7 +39,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\fitz;..\pdf"
+				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="DEBUG=1"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -113,7 +113,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\fitz;..\pdf"
+				AdditionalIncludeDirectories="..\include"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
@@ -185,7 +185,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\fitz;..\pdf"
+				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="MEMENTO=1;DEBUG=1"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
diff --git a/win32/mujstest-v8.vcproj b/win32/mujstest-v8.vcproj
index 37d88b98..db8b5ec3 100644
--- a/win32/mujstest-v8.vcproj
+++ b/win32/mujstest-v8.vcproj
@@ -39,7 +39,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\fitz;..\pdf;..\xps;..\cbz"
+				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -116,7 +116,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\fitz;..\pdf;..\xps;..\cbz"
+				AdditionalIncludeDirectories="..\include"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
@@ -190,7 +190,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\fitz;..\pdf;..\xps;..\cbz"
+				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1;DEBUG=1"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -264,7 +264,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\fitz;..\pdf;..\xps;..\cbz"
+				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_OPENSSL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -341,7 +341,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\fitz;..\pdf;..\xps;..\cbz"
+				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="HAVE_OPENSSL"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
diff --git a/win32/mupdf-v8.vcproj b/win32/mupdf-v8.vcproj
index 6bfcab18..37ec5ccf 100644
--- a/win32/mupdf-v8.vcproj
+++ b/win32/mupdf-v8.vcproj
@@ -39,7 +39,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\fitz;..\pdf;..\xps;..\cbz"
+				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -116,7 +116,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\fitz;..\pdf;..\xps;..\cbz"
+				AdditionalIncludeDirectories="..\include"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
@@ -190,7 +190,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\fitz;..\pdf;..\xps;..\cbz"
+				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1;DEBUG=1"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -264,7 +264,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\fitz;..\pdf;..\xps;..\cbz"
+				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_OPENSSL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -341,7 +341,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\fitz;..\pdf;..\xps;..\cbz"
+				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="HAVE_OPENSSL"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
diff --git a/win32/mupdf.vcproj b/win32/mupdf.vcproj
index 95c3a383..8350e7eb 100644
--- a/win32/mupdf.vcproj
+++ b/win32/mupdf.vcproj
@@ -39,7 +39,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\fitz;..\pdf;..\xps;..\cbz"
+				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -113,7 +113,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\fitz;..\pdf;..\xps;..\cbz"
+				AdditionalIncludeDirectories="..\include"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
@@ -185,7 +185,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\fitz;..\pdf;..\xps;..\cbz"
+				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1;DEBUG=1"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -257,7 +257,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\fitz;..\pdf;..\xps;..\cbz"
+				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_OPENSSL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -333,7 +333,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\fitz;..\pdf;..\xps;..\cbz"
+				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="HAVE_OPENSSL"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
diff --git a/win32/mutool.vcproj b/win32/mutool.vcproj
index bc478b8e..a208dbc6 100644
--- a/win32/mutool.vcproj
+++ b/win32/mutool.vcproj
@@ -39,7 +39,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\fitz;..\pdf;..\xps"
+				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="DEBUG=1"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -113,7 +113,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\fitz;..\pdf;..\xps"
+				AdditionalIncludeDirectories="..\include"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
@@ -185,7 +185,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\fitz;..\pdf;..\xps"
+				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="MEMENTO=1;DEBUG=1"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"