Update Makefiles and project files for new thirdparty versions.

6 files changed, 158 insertions, 152 deletions

diff --git a/win32/jbig2dec/jbig2dec.vcproj b/win32/jbig2dec/jbig2dec.vcproj
index cbc2fbbc..037ddf6b 100644
--- a/win32/jbig2dec/jbig2dec.vcproj
+++ b/win32/jbig2dec/jbig2dec.vcproj
@@ -148,127 +148,127 @@
 			Name="jbig2dec"

 			>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\config_win32.h"

+				RelativePath="../../thirdparty/jbig2dec/config_win32.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2.c"

+				RelativePath="../../thirdparty/jbig2dec/jbig2.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2.h"

+				RelativePath="../../thirdparty/jbig2dec/jbig2.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_arith.c"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_arith.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_arith.h"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_arith.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_arith_iaid.c"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_arith_iaid.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_arith_iaid.h"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_arith_iaid.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_arith_int.c"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_arith_int.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_arith_int.h"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_arith_int.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_generic.c"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_generic.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_generic.h"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_generic.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_halftone.c"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_halftone.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_huffman.c"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_huffman.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_huffman.h"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_huffman.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_hufftab.h"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_hufftab.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_image.c"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_image.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_image.h"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_image.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_image_pbm.c"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_image_pbm.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_metadata.c"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_metadata.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_metadata.h"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_metadata.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_mmr.c"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_mmr.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_mmr.h"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_mmr.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_page.c"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_page.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_priv.h"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_priv.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_refinement.c"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_refinement.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_segment.c"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_segment.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_symbol_dict.c"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_symbol_dict.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_symbol_dict.h"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_symbol_dict.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_text.c"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_text.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\jbig2_text.h"

+				RelativePath="../../thirdparty/jbig2dec/jbig2_text.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\thirdparty\jbig2dec\os_types.h"

+				RelativePath="../../thirdparty/jbig2dec/os_types.h"

 				>

 			</File>

 		</Filter>

diff --git a/win32/jpeg/jpeg.vcproj b/win32/jpeg/jpeg.vcproj
index 633e81ee..cd2e040f 100644
--- a/win32/jpeg/jpeg.vcproj
+++ b/win32/jpeg/jpeg.vcproj
@@ -25,7 +25,7 @@
 			<Tool

 				Name="VCPreBuildEventTool"

 				Description="Copying jpeg config"

-				CommandLine="copy ..\..\thirdparty\jpeg\jconfig.vc ..\..\thirdparty\jpeg\jconfig.h /Y"

+				CommandLine="copy ..\..\thirdparty\jpeg-8c\jconfig.vc ..\..\thirdparty\jpeg-8c\jconfig.h /Y"

 			/>

 			<Tool

 				Name="VCCustomBuildTool"

@@ -90,6 +90,8 @@
 			>

 			<Tool

 				Name="VCPreBuildEventTool"

+				Description="Copying jpeg config"

+				CommandLine="copy ..\..\thirdparty\jpeg-8c\jconfig.vc ..\..\thirdparty\jpeg-8c\jconfig.h /Y"

 			/>

 			<Tool

 				Name="VCCustomBuildTool"

@@ -152,223 +154,223 @@
 			Name="jpeg"

 			>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jaricom.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jcapimin.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jcapistd.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jcarith.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jccoefct.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jccolor.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jcdctmgr.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jchuff.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jcinit.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jcmainct.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jcmarker.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jcmaster.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jcomapi.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jconfig.h"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jcparam.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jcprepct.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jcsample.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jctrans.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jdapimin.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jdapistd.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jdarith.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jdatadst.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jdatasrc.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jdcoefct.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jdcolor.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jdct.h"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jddctmgr.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jdhuff.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jdinput.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jdmainct.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jdmarker.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jdmaster.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jdmerge.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jdpostct.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jdsample.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jdtrans.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jerror.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jerror.h"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jfdctflt.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jfdctfst.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jfdctint.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jidctflt.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jidctfst.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jidctint.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jinclude.h"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jmemansi.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jmemmgr.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jmemsys.h"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jmorecfg.h"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jpegint.h"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jpeglib.h"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jquant1.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jquant2.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jutils.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/jpeg-8c/jversion.h"

 				>

 			</File>

 		</Filter>

diff --git a/win32/libopenjpeg/libopenjpeg.vcproj b/win32/libopenjpeg/libopenjpeg.vcproj
index f9f46e69..98e272a5 100644
--- a/win32/libopenjpeg/libopenjpeg.vcproj
+++ b/win32/libopenjpeg/libopenjpeg.vcproj
@@ -24,6 +24,8 @@
 			>

 			<Tool

 				Name="VCPreBuildEventTool"

+				Description="Copying openjpeg config"

+				CommandLine="copy ..\..\thirdparty\openjpeg-1.4\opj_config.h.in.user ..\..\thirdparty\openjpeg-1.4\libopenjpeg\opj_config.h /Y"

 			/>

 			<Tool

 				Name="VCCustomBuildTool"

@@ -91,6 +93,8 @@
 			>

 			<Tool

 				Name="VCPreBuildEventTool"

+				Description="Copying openjpeg config"

+				CommandLine="copy ..\..\thirdparty\openjpeg-1.4\opj_config.h.in.user ..\..\thirdparty\openjpeg-1.4\libopenjpeg\opj_config.h /Y"

 			/>

 			<Tool

 				Name="VCCustomBuildTool"

@@ -152,167 +156,167 @@
 			Name="libopenjpeg"

 			>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\bio.c"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/bio.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\bio.h"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/bio.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\cio.c"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/cio.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\cio.h"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/cio.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\dwt.c"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/dwt.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\dwt.h"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/dwt.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\event.c"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/event.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\event.h"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/event.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\fix.h"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/fix.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\image.c"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/image.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\image.h"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/image.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\int.h"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/int.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\j2k.c"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/j2k.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\j2k.h"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/j2k.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\j2k_lib.c"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/j2k_lib.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\j2k_lib.h"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/j2k_lib.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\jp2.c"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/jp2.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\jp2.h"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/jp2.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\jpt.c"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/jpt.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\jpt.h"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/jpt.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\mct.c"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/mct.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\mct.h"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/mct.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\mqc.c"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/mqc.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\mqc.h"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/mqc.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\openjpeg.c"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/openjpeg.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\openjpeg.h"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/openjpeg.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\opj_includes.h"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/opj_includes.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\opj_malloc.h"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/opj_malloc.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\pi.c"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/pi.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\pi.h"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/pi.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\raw.c"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/raw.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\raw.h"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/raw.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\t1.c"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/t1.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\t1.h"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/t1.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\t1_luts.h"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/t1_luts.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\t2.c"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/t2.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\t2.h"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/t2.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\tcd.c"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/tcd.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\tcd.h"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/tcd.h"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\tgt.c"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/tgt.c"

 				>

 			</File>

 			<File

-				RelativePath="../../thirdparty/openjpeg/libopenjpeg\tgt.h"

+				RelativePath="../../thirdparty/openjpeg-1.4/libopenjpeg/tgt.h"

 				>

 			</File>

 		</Filter>

diff --git a/win32/mupdf.sln b/win32/mupdf.sln
index f370dd44..c60ae44c 100644
--- a/win32/mupdf.sln
+++ b/win32/mupdf.sln
@@ -1,7 +1,7 @@
 

 Microsoft Visual Studio Solution File, Format Version 9.00

 # Visual Studio 2005

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfreetype", "..\thirdparty\freetype\builds\win32\vc2005\freetype.vcproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfreetype", "..\thirdparty\freetype-2.4.4\builds\win32\vc2005\freetype.vcproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"

 EndProject

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

 EndProject

diff --git a/win32/mupdf/mupdf.vcproj b/win32/mupdf/mupdf.vcproj
index 8292a2a8..eff3125a 100644
--- a/win32/mupdf/mupdf.vcproj
+++ b/win32/mupdf/mupdf.vcproj
@@ -40,7 +40,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

+				AdditionalIncludeDirectories="..\..\thirdparty\freetype-2.4.4\include;..\..\thirdparty\jpeg-8c;..\..\thirdparty\jbig2dec;..\..\thirdparty\openjpeg-1.4\libopenjpeg;..\..\thirdparty\zlib-1.2.5;..\..\mupdf;..\..\fitz"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -106,7 +106,7 @@
 				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="1"

 				OmitFramePointers="true"

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

+				AdditionalIncludeDirectories="..\..\thirdparty\freetype-2.4.4\include;..\..\thirdparty\jpeg-8c;..\..\thirdparty\jbig2dec;..\..\thirdparty\openjpeg-1.4\libopenjpeg;..\..\thirdparty\zlib-1.2.5;..\..\mupdf;..\..\fitz"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

diff --git a/win32/zlib/zlib.vcproj b/win32/zlib/zlib.vcproj
index ab5d242b..0a78a55a 100644
--- a/win32/zlib/zlib.vcproj
+++ b/win32/zlib/zlib.vcproj
@@ -148,87 +148,87 @@
 			Name="zlib"

 			>

 			<File

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

+				RelativePath="../../thirdparty/zlib-1.2.5/adler32.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/zlib-1.2.5/compress.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/zlib-1.2.5/crc32.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/zlib-1.2.5/crc32.h"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/zlib-1.2.5/deflate.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/zlib-1.2.5/deflate.h"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/zlib-1.2.5/infback.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/zlib-1.2.5/inffast.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/zlib-1.2.5/inffast.h"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/zlib-1.2.5/inffixed.h"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/zlib-1.2.5/inflate.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/zlib-1.2.5/inflate.h"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/zlib-1.2.5/inftrees.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/zlib-1.2.5/inftrees.h"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/zlib-1.2.5/trees.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/zlib-1.2.5/trees.h"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/zlib-1.2.5/uncompr.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/zlib-1.2.5/zconf.h"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/zlib-1.2.5/zlib.h"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/zlib-1.2.5/zutil.c"

 				>

 			</File>

 			<File

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

+				RelativePath="../../thirdparty/zlib-1.2.5/zutil.h"

 				>

 			</File>

 		</Filter>