Update win32 project files to the newest version of the thirdparty libs.

5 files changed, 68 insertions, 56 deletions

diff --git a/win32/fitz/fitz.vcproj b/win32/fitz/fitz.vcproj
index 99f7426b..67ccf554 100644
--- a/win32/fitz/fitz.vcproj
+++ b/win32/fitz/fitz.vcproj
@@ -40,7 +40,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\..\thirdparty\freetype\include;..\..\thirdparty\jpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib-123;..\..\mupdf"

+				AdditionalIncludeDirectories="..\..\thirdparty\freetype\include;..\..\thirdparty\jpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\mupdf"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -103,7 +103,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\thirdparty\freetype\include;..\..\thirdparty\jpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib-123;..\..\mupdf"

+				AdditionalIncludeDirectories="..\..\thirdparty\freetype\include;..\..\thirdparty\jpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\mupdf"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

diff --git a/win32/jpeg/jpeg.vcproj b/win32/jpeg/jpeg.vcproj
index 6a8bafce..0b59f9ea 100644
--- a/win32/jpeg/jpeg.vcproj
+++ b/win32/jpeg/jpeg.vcproj
@@ -149,6 +149,10 @@
 			Name="jpeg"

 			>

 			<File

+				RelativePath="..\..\thirdparty\jpeg\jaricom.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\thirdparty\jpeg\jcapimin.c"

 				>

 			</File>

@@ -157,6 +161,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\thirdparty\jpeg\jcarith.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\thirdparty\jpeg\jccoefct.c"

 				>

 			</File>

@@ -173,10 +181,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jpeg\jchuff.h"

-				>

-			</File>

-			<File

 				RelativePath="..\..\thirdparty\jpeg\jcinit.c"

 				>

 			</File>

@@ -197,11 +201,11 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jpeg\jcparam.c"

+				RelativePath="..\..\thirdparty\jpeg\jconfig.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jpeg\jcphuff.c"

+				RelativePath="..\..\thirdparty\jpeg\jcparam.c"

 				>

 			</File>

 			<File

@@ -225,6 +229,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\thirdparty\jpeg\jdarith.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\thirdparty\jpeg\jdatadst.c"

 				>

 			</File>

@@ -253,10 +261,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jpeg\jdhuff.h"

-				>

-			</File>

-			<File

 				RelativePath="..\..\thirdparty\jpeg\jdinput.c"

 				>

 			</File>

@@ -277,10 +281,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jpeg\jdphuff.c"

-				>

-			</File>

-			<File

 				RelativePath="..\..\thirdparty\jpeg\jdpostct.c"

 				>

 			</File>

@@ -325,19 +325,15 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jpeg\jidctred.c"

-				>

-			</File>

-			<File

 				RelativePath="..\..\thirdparty\jpeg\jinclude.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jpeg\jmemmgr.c"

+				RelativePath="..\..\thirdparty\jpeg\jmemansi.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jpeg\jmemnobs.c"

+				RelativePath="..\..\thirdparty\jpeg\jmemmgr.c"

 				>

 			</File>

 			<File

diff --git a/win32/mupdf.sln b/win32/mupdf.sln
index d6324431..db4b7e73 100644
--- a/win32/mupdf.sln
+++ b/win32/mupdf.sln
@@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "..\thirdparty\f
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg", "jpeg\jpeg.vcproj", "{A738D37E-F4E2-4ACC-A086-14149E3B6639}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibOpenJPEG", "..\thirdparty\openjpeg\LibOpenJPEG.vcproj", "{316AEB7D-E24A-4158-B8F9-44BF30C5767C}"

+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

@@ -20,7 +20,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdfshow", "pdfshow\pdfshow.
 		{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}

-		{316AEB7D-E24A-4158-B8F9-44BF30C5767C} = {316AEB7D-E24A-4158-B8F9-44BF30C5767C}

+		{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}

 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}

@@ -33,7 +33,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdfclean", "pdfclean\pdfcle
 	ProjectSection(ProjectDependencies) = postProject

 		{A40AEB27-EF39-4966-9AD3-88C78DE88907} = {A40AEB27-EF39-4966-9AD3-88C78DE88907}

 		{B664D05B-CF78-423A-B1E7-5E84FD939580} = {B664D05B-CF78-423A-B1E7-5E84FD939580}

-		{316AEB7D-E24A-4158-B8F9-44BF30C5767C} = {316AEB7D-E24A-4158-B8F9-44BF30C5767C}

+		{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}

@@ -49,7 +49,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdfdraw", "pdfdraw\pdfdraw.
 		{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}

-		{316AEB7D-E24A-4158-B8F9-44BF30C5767C} = {316AEB7D-E24A-4158-B8F9-44BF30C5767C}

+		{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}

@@ -61,7 +61,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdfextract", "pdfextract\pd
 		{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}

-		{316AEB7D-E24A-4158-B8F9-44BF30C5767C} = {316AEB7D-E24A-4158-B8F9-44BF30C5767C}

+		{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}

@@ -75,7 +75,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdfinfo", "pdfinfo\pdfinfo.
 		{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}

-		{316AEB7D-E24A-4158-B8F9-44BF30C5767C} = {316AEB7D-E24A-4158-B8F9-44BF30C5767C}

+		{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}

@@ -102,7 +102,7 @@ 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}

-		{316AEB7D-E24A-4158-B8F9-44BF30C5767C} = {316AEB7D-E24A-4158-B8F9-44BF30C5767C}

+		{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}

@@ -138,10 +138,10 @@ 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

-		{316AEB7D-E24A-4158-B8F9-44BF30C5767C}.Debug|Win32.ActiveCfg = Debug|Win32

-		{316AEB7D-E24A-4158-B8F9-44BF30C5767C}.Debug|Win32.Build.0 = Debug|Win32

-		{316AEB7D-E24A-4158-B8F9-44BF30C5767C}.Release|Win32.ActiveCfg = Release|Win32

-		{316AEB7D-E24A-4158-B8F9-44BF30C5767C}.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

diff --git a/win32/pdfclean/pdfclean.vcproj b/win32/pdfclean/pdfclean.vcproj
index bba6ea68..2d125e0f 100644
--- a/win32/pdfclean/pdfclean.vcproj
+++ b/win32/pdfclean/pdfclean.vcproj
@@ -138,7 +138,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				LinkIncremental="1"

-				IgnoreDefaultLibraryNames="libcmt"
+				IgnoreDefaultLibraryNames="libcmt"

 				GenerateDebugInformation="true"

 				SubSystem="1"

 				OptimizeReferences="2"

diff --git a/win32/zlib/zlib.vcproj b/win32/zlib/zlib.vcproj
index 1a1dcfc3..a8ef90e8 100644
--- a/win32/zlib/zlib.vcproj
+++ b/win32/zlib/zlib.vcproj
@@ -145,91 +145,107 @@
 			Name="zlib"

 			>

 			<File

-				RelativePath="..\..\thirdparty\zlib-123\adler32.c"

+				RelativePath="..\..\thirdparty\zlib\adler32.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\zlib-123\compress.c"

+				RelativePath="..\..\thirdparty\zlib\compress.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\zlib-123\crc32.c"

+				RelativePath="..\..\thirdparty\zlib\crc32.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\zlib-123\crc32.h"

+				RelativePath="..\..\thirdparty\zlib\crc32.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\zlib-123\deflate.c"

+				RelativePath="..\..\thirdparty\zlib\deflate.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\zlib-123\deflate.h"

+				RelativePath="..\..\thirdparty\zlib\deflate.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\zlib-123\gzio.c"

+				RelativePath="..\..\thirdparty\zlib\gzclose.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\zlib-123\infback.c"

+				RelativePath="..\..\thirdparty\zlib\gzguts.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\zlib-123\inffast.c"

+				RelativePath="..\..\thirdparty\zlib\gzlib.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\zlib-123\inffast.h"

+				RelativePath="..\..\thirdparty\zlib\gzread.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\zlib-123\inffixed.h"

+				RelativePath="..\..\thirdparty\zlib\gzwrite.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\zlib-123\inflate.c"

+				RelativePath="..\..\thirdparty\zlib\infback.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\zlib-123\inflate.h"

+				RelativePath="..\..\thirdparty\zlib\inffast.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\zlib-123\inftrees.c"

+				RelativePath="..\..\thirdparty\zlib\inffast.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\zlib-123\inftrees.h"

+				RelativePath="..\..\thirdparty\zlib\inffixed.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\zlib-123\trees.c"

+				RelativePath="..\..\thirdparty\zlib\inflate.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\zlib-123\trees.h"

+				RelativePath="..\..\thirdparty\zlib\inflate.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\zlib-123\uncompr.c"

+				RelativePath="..\..\thirdparty\zlib\inftrees.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\zlib-123\zconf.h"

+				RelativePath="..\..\thirdparty\zlib\inftrees.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\zlib-123\zlib.h"

+				RelativePath="..\..\thirdparty\zlib\trees.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\zlib-123\zutil.c"

+				RelativePath="..\..\thirdparty\zlib\trees.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\zlib-123\zutil.h"

+				RelativePath="..\..\thirdparty\zlib\uncompr.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\thirdparty\zlib\zconf.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\thirdparty\zlib\zlib.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\thirdparty\zlib\zutil.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\thirdparty\zlib\zutil.h"

 				>

 			</File>

 		</Filter>