diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2016-01-22 14:22:07 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2016-01-28 20:09:54 +0000 |
| commit | afbb36f359273f272e23fc1e22fcdc6a0cc587de (patch) | |
| tree | 3bc16b8fc2907bd0538bbc994a29e4e77043fb72 /platform | |
| parent | 89559a410d5e79e0922128f90171935c6d55341a (diff) | |
| download | mupdf-afbb36f359273f272e23fc1e22fcdc6a0cc587de.tar.xz | |
Add harfbuzz thirdparty submodule.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/win32/libmupdf.vcproj | 18 | ||||
| -rw-r--r-- | platform/win32/libthirdparty.vcproj | 200 |
2 files changed, 203 insertions, 15 deletions
diff --git a/platform/win32/libmupdf.vcproj b/platform/win32/libmupdf.vcproj index 038d77e6..9dd64b6f 100644 --- a/platform/win32/libmupdf.vcproj +++ b/platform/win32/libmupdf.vcproj @@ -43,7 +43,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\scripts\openjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\scripts\openjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;USE_OUTPUT_DEBUG_STRING" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -172,7 +172,7 @@ Optimization="2" EnableIntrinsicFunctions="true" WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\scripts\openjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\scripts\openjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -296,7 +296,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\scripts\openjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\scripts\openjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" PreprocessorDefinitions="FZ_LARGEFILE;MEMENTO=1;DEBUG=1;USE_OUTPUT_DEBUG_STRING" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -421,7 +421,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\scripts\openjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\openssl\include;..\..\thirdparty\mujs" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\scripts\openjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\openssl\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" PreprocessorDefinitions="FZ_LARGEFILE;DEBUG=1;HAVE_OPENSSL;USE_OUTPUT_DEBUG_STRING" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -549,7 +549,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\scripts\openjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\scripts\openjpeg;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\mujs;..\..\thirdparty\harfbuzz\src" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -1067,10 +1067,6 @@ > </File> <File - RelativePath="..\..\source\fitz\ucdn.h" - > - </File> - <File RelativePath="..\..\source\fitz\unicodedata_db.h" > </File> @@ -1562,6 +1558,10 @@ > </File> <File + RelativePath="..\..\include\mupdf\fitz\ucdn.h" + > + </File> + <File RelativePath="..\..\include\mupdf\fitz\unzip.h" > </File> diff --git a/platform/win32/libthirdparty.vcproj b/platform/win32/libthirdparty.vcproj index e2f0c59f..934a88f3 100644 --- a/platform/win32/libthirdparty.vcproj +++ b/platform/win32/libthirdparty.vcproj @@ -42,8 +42,8 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\scripts\openjpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype" - PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H=\"slimftmodules.h\";FT_CONFIG_OPTIONS_H=\"slimftoptions.h\";DEBUG=1;verbose=-1;JBIG_EXTERNAL_MEMENTO_H=\"memento.h\"" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\scripts\openjpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\" + PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H=\"slimftmodules.h\";FT_CONFIG_OPTIONS_H=\"slimftoptions.h\";DEBUG=1;verbose=-1;JBIG_EXTERNAL_MEMENTO_H=\"memento.h\";HAVE_OT;HAVE_UCDN;HB_NO_MT" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -167,8 +167,8 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\scripts\openjpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype" - PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H=\"slimftmodules.h\";FT_CONFIG_OPTIONS_H=\"slimftoptions.h\";verbose=-1;JBIG_EXTERNAL_MEMENTO_H=\"memento.h\"" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\scripts\openjpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\" + PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H=\"slimftmodules.h\";FT_CONFIG_OPTIONS_H=\"slimftoptions.h\";verbose=-1;JBIG_EXTERNAL_MEMENTO_H=\"memento.h\";HAVE_OT;HAVE_UCDN;HB_NO_MT" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -290,8 +290,8 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\scripts\openjpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype" - PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H=\"slimftmodules.h\";FT_CONFIG_OPTIONS_H=\"slimftoptions.h\";MEMENTO=1;DEBUG=1;verbose=-1;JBIG_EXTERNAL_MEMENTO_H=\"memento.h\"" + AdditionalIncludeDirectories="..\..\scripts\freetype;..\..\scripts\jpeg;..\..\scripts\openjpeg;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\freetype\include\freetype;..\..\include\" + PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H=\"slimftmodules.h\";FT_CONFIG_OPTIONS_H=\"slimftoptions.h\";MEMENTO=1;DEBUG=1;verbose=-1;JBIG_EXTERNAL_MEMENTO_H=\"memento.h\";HAVE_OT;HAVE_UCDN;HB_NO_MT" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -1316,6 +1316,194 @@ > </File> </Filter> + <Filter + Name="harfbuzz" + > + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-blob.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-buffer-serialize.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-buffer.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-common.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-face.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-fallback-shape.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-font.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-ft.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-ot-layout.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-ot-map.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-ot-shape-complex-arabic.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-ot-shape-complex-default.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-ot-shape-complex-hangul.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-ot-shape-complex-hebrew.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-ot-shape-complex-indic-table.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-ot-shape-complex-indic.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-ot-shape-complex-myanmar.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-ot-shape-complex-thai.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-ot-shape-complex-tibetan.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-ot-shape-complex-use-table.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-ot-shape-complex-use.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-ot-shape-fallback.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-ot-shape-normalize.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-ot-shape.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-ot-tag.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-set.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-shape-plan.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-shape.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-shaper.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-ucdn.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-unicode.cc" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-warning.cc" + > + </File> + <Filter + Name="include" + > + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-blob.h" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-buffer.h" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-common.h" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-deprecated.h" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-face.h" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-font.h" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-ft.h" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-set.h" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-shape-plan.h" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-shape.h" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-unicode.h" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb-version.h" + > + </File> + <File + RelativePath="..\..\thirdparty\harfbuzz\src\hb.h" + > + </File> + </Filter> + </Filter> </Files> <Globals> </Globals> |