diff options
author | Robin Watts <robin.watts@artifex.com> | 2013-10-16 15:03:14 +0100 |
---|---|---|
committer | Robin Watts <robin.watts@artifex.com> | 2013-11-28 00:41:08 +0000 |
commit | 81a97d655e373d7371e70f6a2051a41f606c62dc (patch) | |
tree | 49b636c7a8b30e1817f8d353a139e1fd18303a5b /platform/win32 | |
parent | 9c910781c2dd9b7b49fedefc9f140d0c3b1a3896 (diff) | |
download | mupdf-81a97d655e373d7371e70f6a2051a41f606c62dc.tar.xz |
Update mupdf to use latest openjpeg pulled from ghostpdl.
The OpenJPEG in gs is v2, with various patches for fixes. These are in
the process of being passed upstream. We now automatically pull the
openjpeg tree out of GhostPDL and put it in as one particular branch
in the thirdparty/openjpeg.git repo. Change to track this in MuPDF.
This is in keeping with what we have been doing with the jbig2dec
repo for a while now.
Diffstat (limited to 'platform/win32')
-rw-r--r-- | platform/win32/libmupdf.vcproj | 10 | ||||
-rw-r--r-- | platform/win32/libthirdparty.vcproj | 434 |
2 files changed, 228 insertions, 216 deletions
diff --git a/platform/win32/libmupdf.vcproj b/platform/win32/libmupdf.vcproj index 3aa188f0..bf0e7a34 100644 --- a/platform/win32/libmupdf.vcproj +++ b/platform/win32/libmupdf.vcproj @@ -40,7 +40,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\ucdn;..\..\generated;..\..\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\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include" PreprocessorDefinitions="DEBUG=1" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -105,7 +105,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\ucdn;..\..\generated;..\..\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\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -165,7 +165,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\ucdn;..\..\generated;..\..\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\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include" PreprocessorDefinitions="MEMENTO=1;DEBUG=1" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -227,7 +227,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\openssl\include" + AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\openssl\include" PreprocessorDefinitions="DEBUG=1;HAVE_OPENSSL" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -292,7 +292,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\ucdn;..\..\generated;..\..\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\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" diff --git a/platform/win32/libthirdparty.vcproj b/platform/win32/libthirdparty.vcproj index ac17de00..8172f952 100644 --- a/platform/win32/libthirdparty.vcproj +++ b/platform/win32/libthirdparty.vcproj @@ -441,218 +441,230 @@ <Filter Name="libopenjpeg" > - <Filter - Name="openjp2" + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\bio.c" > - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\bio.c" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\bio.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\cidx_manager.c" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\cidx_manager.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\cio.c" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\cio.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\dwt.c" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\dwt.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\event.c" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\event.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\function_list.c" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\function_list.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\image.c" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\image.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\indexbox_manager.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\invert.c" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\invert.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\j2k.c" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\j2k.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\jp2.c" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\jp2.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\mct.c" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\mct.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\mqc.c" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\mqc.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\openjpeg.c" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\openjpeg.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_clock.c" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_clock.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_includes.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_intmath.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_inttypes.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_malloc.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\opj_stdint.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\phix_manager.c" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\pi.c" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\pi.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\ppix_manager.c" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\raw.c" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\raw.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\t1.c" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\t1.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\t1_generate_luts.c" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\t1_luts.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\t2.c" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\t2.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\tcd.c" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\tcd.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\tgt.c" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\tgt.h" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\thix_manager.c" - > - </File> - <File - RelativePath="..\..\thirdparty\openjpeg\src\lib\openjp2\tpix_manager.c" - > - </File> - </Filter> + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\bio.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\cidx_manager.c" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\cidx_manager.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\cio.c" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\cio.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\dwt.c" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\dwt.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\event.c" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\event.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\fix.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\function_list.c" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\function_list.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\image.c" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\image.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\indexbox_manager.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\int.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\invert.c" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\invert.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\j2k.c" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\j2k.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\j2k_lib.c" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\j2k_lib.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\jp2.c" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\jp2.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\mct.c" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\mct.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\mqc.c" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\mqc.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\openjpeg.c" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\openjpeg.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\opj_config.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\opj_config_private.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\opj_includes.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\opj_intmath.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\opj_inttypes.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\opj_malloc.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\opj_stdint.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\phix_manager.c" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\pi.c" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\pi.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\ppix_manager.c" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\raw.c" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\raw.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\t1.c" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\t1.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\t1_generate_luts.c" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\t1_luts.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\t2.c" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\t2.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\tcd.c" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\tcd.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\tgt.c" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\tgt.h" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\thix_manager.c" + > + </File> + <File + RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\tpix_manager.c" + > + </File> </Filter> <Filter Name="libfreetype" |