diff options
| author | Werner Lemberg <wl@gnu.org> | 2017-03-18 07:06:49 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2017-03-18 07:06:49 +0100 |
| commit | 9931175dcc57313be60d3633f7597ec4db446a35 (patch) | |
| tree | 998187908fa4534fd72429c81e5190094d43c424 /src/base/ftbase.c | |
| parent | d5bfa053f5854cc42966634e1b26a8024b7a51d4 (diff) | |
| download | freetype2-9931175dcc57313be60d3633f7597ec4db446a35.tar.gz | |
Improve `make multi'.
* src/autofit/aflatin2.c: Guard file with FT_OPTION_AUTOFIT2.
* src/base/ftmac.c: Guard more parts of the file with FT_MACINTOSH.
* src/psaux/afmparse.c: Guard file with T1_CONFIG_OPTION_NO_AFM.
* src/sfnt/pngshim.c: Guard file with
TT_CONFIG_OPTION_EMBEDDED_BITMAPS also.
* src/sfnt/ttbdf.c: Avoid empty source file.
* src/sfnt/ttpost.c: Guard file with
TT_CONFIG_OPTION_POSTSCRIPT_NAMES.
* src/sfnt/ttsbit.c: Guard file with
TT_CONFIG_OPTION_EMBEDDED_BITMAPS.
* src/truetype/ttgxvar.c, src/truetype/ttinterp.c: Avoid empty
source file.
* src/truetype/ttsubpix.c: Guard file with
TT_USE_BYTECODE_INTERPRETER also.
* src/type1/t1afm.c: Guard file with T1_CONFIG_OPTION_NO_AFM.
* src/autofit/autofit.c, src/base/ftbase.c, src/cache/ftcache.c,
src/cff/cff.c, src/cid/type1cid.c, src/gxvalid/gxvalid.c,
src/pcf/pcf.c, src/pfr/pfr.c, src/psaux/psaux.c,
src/pshinter/pshinter.c, src/psnames/psnames.c, src/raster/raster.c,
src/sfnt/sfnt.c, src/smooth/smooth.c, src/truetype/truetype.c,
src/type1/type1.c, src/type42/type42.c: Remove conditionals; sort
entries.
Diffstat (limited to 'src/base/ftbase.c')
| -rw-r--r-- | src/base/ftbase.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/base/ftbase.c b/src/base/ftbase.c index 993ac7228..55f735994 100644 --- a/src/base/ftbase.c +++ b/src/base/ftbase.c @@ -17,26 +17,23 @@ #include <ft2build.h> - #define FT_MAKE_OPTION_SINGLE_OBJECT -#include "ftpic.c" #include "basepic.c" #include "ftadvanc.c" #include "ftcalc.c" #include "ftdbgmem.c" #include "ftgloadr.c" #include "fthash.c" +#include "ftmac.c" #include "ftobjs.c" #include "ftoutln.c" +#include "ftpic.c" #include "ftrfork.c" #include "ftsnames.c" #include "ftstream.c" #include "fttrigon.c" #include "ftutil.c" -#ifdef FT_MACINTOSH -#include "ftmac.c" -#endif /* END */ |