diff --git a/ChangeLog b/ChangeLog index 6ba1c97e..664f18bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-09-30 Werner Lemberg + + * src/base/rules.mk (BASE_SRC): Remove `ftapi.c' (which is no longer + in use). + + * src/base/ftbase.c: Include `ftlcdfil.c'. + 2006-09-29 Werner Lemberg * src/sfnt/ttcmap.c (tt_cmap4_char_map_binary): Fix algorithm for diff --git a/src/base/ftbase.c b/src/base/ftbase.c index 7d5a7fd8..4a77cd9e 100644 --- a/src/base/ftbase.c +++ b/src/base/ftbase.c @@ -4,7 +4,7 @@ /* */ /* Single object library component (body only). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004 by */ +/* Copyright 1996-2001, 2002, 2003, 2004, 2006 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -20,16 +20,17 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT -#include "ftutil.c" -#include "ftdbgmem.c" -#include "ftstream.c" #include "ftcalc.c" -#include "fttrigon.c" -#include "ftoutln.c" +#include "ftdbgmem.c" #include "ftgloadr.c" -#include "ftobjs.c" +#include "ftlcdfil.c" #include "ftnames.c" +#include "ftobjs.c" +#include "ftoutln.c" #include "ftrfork.c" +#include "ftstream.c" +#include "fttrigon.c" +#include "ftutil.c" #if defined( __APPLE__ ) && !defined ( DARWIN_NO_CARBON ) #include "ftmac.c" diff --git a/src/base/rules.mk b/src/base/rules.mk index 32cdeb14..980216e2 100644 --- a/src/base/rules.mk +++ b/src/base/rules.mk @@ -32,17 +32,19 @@ BASE_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(SRC_DIR)/base) # # ftsystem, ftinit, and ftdebug are handled by freetype.mk # -BASE_SRC := $(BASE_DIR)/ftapi.c \ - $(BASE_DIR)/ftcalc.c \ +# All files listed here should be included in `ftbase.c' (for a `single' +# build). +# +BASE_SRC := $(BASE_DIR)/ftcalc.c \ $(BASE_DIR)/ftdbgmem.c \ $(BASE_DIR)/ftgloadr.c \ + $(BASE_DIR)/ftlcdfil.c \ $(BASE_DIR)/ftnames.c \ $(BASE_DIR)/ftobjs.c \ $(BASE_DIR)/ftoutln.c \ $(BASE_DIR)/ftrfork.c \ $(BASE_DIR)/ftstream.c \ $(BASE_DIR)/fttrigon.c \ - $(BASE_DIR)/ftlcdfil.c \ $(BASE_DIR)/ftutil.c # Base layer `extensions' sources