diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2015-10-06 13:55:14 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2015-10-06 16:37:38 +0200 |
| commit | 70ed309e1c69ab8cd7e107f27d101f9a13416333 (patch) | |
| tree | a2ff182138ba4b5d607637df5c8b554f5613ecad | |
| parent | d97c9eda43563ca95b11e1da7ad43fd2a320d8e0 (diff) | |
| download | mupdf-70ed309e1c69ab8cd7e107f27d101f9a13416333.tar.xz | |
Update freetype submodule to version 2.6.1.
| -rw-r--r-- | Makethird | 2 | ||||
| -rw-r--r-- | platform/win32/libthirdparty.vcproj | 8 | ||||
| -rw-r--r-- | scripts/freetype/slimftoptions.h | 11 | ||||
| m--------- | thirdparty/freetype | 0 |
4 files changed, 13 insertions, 8 deletions
@@ -77,6 +77,7 @@ FREETYPE_SRC := \ ftbbox.c \ ftbitmap.c \ ftdebug.c \ + ftfntfmt.c \ ftgasp.c \ ftglyph.c \ ftinit.c \ @@ -84,7 +85,6 @@ FREETYPE_SRC := \ ftsynth.c \ ftsystem.c \ fttype1.c \ - ftxf86.c \ cff.c \ psaux.c \ pshinter.c \ diff --git a/platform/win32/libthirdparty.vcproj b/platform/win32/libthirdparty.vcproj index de32959b..8d55150b 100644 --- a/platform/win32/libthirdparty.vcproj +++ b/platform/win32/libthirdparty.vcproj @@ -915,6 +915,10 @@ > </File> <File + RelativePath="..\..\thirdparty\freetype\src\base\ftfntfmt.c" + > + </File> + <File RelativePath="..\..\thirdparty\freetype\src\base\ftgasp.c" > </File> @@ -942,10 +946,6 @@ RelativePath="..\..\thirdparty\freetype\src\base\fttype1.c" > </File> - <File - RelativePath="..\..\thirdparty\freetype\src\base\ftxf86.c" - > - </File> </Filter> <Filter Name="include" diff --git a/scripts/freetype/slimftoptions.h b/scripts/freetype/slimftoptions.h index 5ee9f315..67f618b9 100644 --- a/scripts/freetype/slimftoptions.h +++ b/scripts/freetype/slimftoptions.h @@ -1,14 +1,19 @@ /* custom ftoption.h which selects the minimum features needed by mupdf */ -#include <config/ftoption.h> +#include <freetype/config/ftoption.h> + #undef FT_CONFIG_OPTION_USE_LZW #undef FT_CONFIG_OPTION_USE_ZLIB +#undef FT_CONFIG_OPTION_USE_BZIP2 +#undef FT_CONFIG_OPTION_USE_PNG +#undef FT_CONFIG_OPTION_USE_HARFBUZZ #undef FT_CONFIG_OPTION_MAC_FONTS #undef FT_CONFIG_OPTION_INCREMENTAL + #undef TT_CONFIG_OPTION_EMBEDDED_BITMAPS +#undef TT_CONFIG_OPTION_SFNT_NAMES #undef TT_CONFIG_OPTION_GX_VAR_SUPPORT #undef TT_CONFIG_OPTION_BDF + #undef T1_CONFIG_OPTION_NO_AFM #undef T1_CONFIG_OPTION_NO_MM_SUPPORT - -#undef FT_CONFIG_OPTION_OLD_INTERNALS diff --git a/thirdparty/freetype b/thirdparty/freetype -Subproject 232bd948fd37821d35e728ec20aeea971fb9616 +Subproject 8cabd919ca63f0e6c12e8405e8542a45d910fa6 |