From 8d3a401fa808a8c70bd6a9ce17d5a840fb0ae2db Mon Sep 17 00:00:00 2001 From: David Turner Date: Tue, 20 Mar 2001 11:14:24 +0000 Subject: [PATCH] * builds/*/*-def.mk: changed the objects directory from "obj" to "objs" * include/freetype/config/ftheader.h: removed obsolete macros like FT_SOURCE_FILE, etc.. and added cache-specific macro definitions that were previously defined in . Added comments to be included in a new API Reference section. * src/*/*: removed the use of FT_SOURCE_FILE, etc.. now, each component needs to added its own directory to the include path at compile time. Modified all "rules.mk" and "descrip.mms" accordingly.. --- ChangeLog | 18 ++- builds/ansi/ansi-def.mk | 2 +- builds/cygwin/cygwin-def.in | 2 +- builds/cygwin/cygwinddef.mk | 2 +- builds/dos/dos-def.mk | 2 +- builds/freetype.mk | 2 +- builds/os2/os2-def.mk | 2 +- builds/unix/ft2unix.h | 2 +- builds/unix/unix-def.in | 2 +- builds/unix/unixddef.mk | 2 +- builds/win32/detect.mk | 8 ++ builds/win32/win32-def.mk | 2 +- include/freetype/config/ftheader.h | 172 +++++++---------------------- include/freetype/config/ftoption.h | 2 +- include/freetype/freetype.h | 12 -- include/freetype/ftcache.h | 9 -- include/freetype/fttypes.h | 28 +++++ src/autohint/ahangles.c | 2 +- src/autohint/ahangles.h | 2 +- src/autohint/ahglobal.c | 4 +- src/autohint/ahglobal.h | 2 +- src/autohint/ahglyph.c | 6 +- src/autohint/ahglyph.h | 2 +- src/autohint/ahhint.c | 6 +- src/autohint/ahhint.h | 2 +- src/autohint/ahmodule.c | 2 +- src/autohint/ahoptim.c | 2 +- src/autohint/ahoptim.h | 2 +- src/autohint/ahtypes.h | 2 +- src/autohint/autohint.c | 10 +- src/autohint/descrip.mms | 2 +- src/autohint/rules.mk | 2 +- src/base/descrip.mms | 2 +- src/base/ftbase.c | 19 ++-- src/base/ftmac.c | 4 +- src/base/ftobjs.c | 8 +- src/cache/descrip.mms | 2 +- src/cache/ftcache.c | 12 +- src/cache/rules.mk | 2 +- src/cff/cff.c | 10 +- src/cff/cffdrivr.c | 6 +- src/cff/cffgload.c | 18 +-- src/cff/cffgload.h | 2 +- src/cff/cffload.c | 8 +- src/cff/cffobjs.c | 8 +- src/cff/cffparse.c | 4 +- src/cff/descrip.mms | 2 +- src/cff/rules.mk | 2 +- src/cid/cidgload.c | 4 +- src/cid/cidgload.h | 2 +- src/cid/cidload.c | 10 +- src/cid/cidload.h | 2 +- src/cid/cidobjs.c | 4 +- src/cid/cidparse.c | 2 +- src/cid/cidriver.c | 4 +- src/cid/descrip.mms | 2 +- src/cid/rules.mk | 2 +- src/cid/type1cid.c | 10 +- src/pcf/descrip.mms | 2 +- src/pcf/pcf.c | 6 +- src/pcf/pcf.h | 2 +- src/pcf/pcfdriver.c | 6 +- src/pcf/pcfread.c | 5 +- src/pcf/pcfutil.c | 2 +- src/pcf/rules.mk | 2 +- src/psaux/descrip.mms | 2 +- src/psaux/psaux.c | 6 +- src/psaux/psauxmod.c | 6 +- src/psaux/psobjs.c | 2 +- src/psaux/rules.mk | 2 +- src/psaux/t1decode.c | 4 +- src/psnames/descrip.mms | 2 +- src/psnames/psmodule.c | 4 +- src/psnames/psnames.c | 2 +- src/psnames/rules.mk | 2 +- src/raster/descrip.mms | 2 +- src/raster/ftraster.c | 2 +- src/raster/ftrend1.c | 4 +- src/raster/raster.c | 4 +- src/raster/rules.mk | 2 +- src/sfnt/descrip.mms | 2 +- src/sfnt/rules.mk | 2 +- src/sfnt/sfdriver.c | 12 +- src/sfnt/sfnt.c | 12 +- src/sfnt/sfobjs.c | 4 +- src/sfnt/ttcmap.c | 4 +- src/sfnt/ttload.c | 4 +- src/sfnt/ttpost.c | 4 +- src/sfnt/ttsbit.c | 2 +- src/sfnt/ttsbit.h | 2 +- src/smooth/descrip.mms | 2 +- src/smooth/ftgrays.c | 2 +- src/smooth/ftsmooth.c | 4 +- src/smooth/rules.mk | 2 +- src/smooth/smooth.c | 4 +- src/truetype/descrip.mms | 2 +- src/truetype/rules.mk | 2 +- src/truetype/truetype.c | 10 +- src/truetype/ttdriver.c | 4 +- src/truetype/ttgload.c | 2 +- src/truetype/ttgload.h | 4 +- src/truetype/ttinterp.c | 2 +- src/truetype/ttinterp.h | 2 +- src/truetype/ttobjs.c | 6 +- src/truetype/ttpload.c | 2 +- src/type1/descrip.mms | 2 +- src/type1/rules.mk | 2 +- src/type1/t1afm.c | 2 +- src/type1/t1afm.h | 2 +- src/type1/t1driver.c | 8 +- src/type1/t1gload.c | 2 +- src/type1/t1gload.h | 2 +- src/type1/t1load.c | 4 +- src/type1/t1load.h | 2 +- src/type1/t1objs.c | 6 +- src/type1/t1parse.c | 2 +- src/type1/type1.c | 12 +- src/winfonts/descrip.mms | 2 +- src/winfonts/rules.mk | 2 +- src/winfonts/winfnt.c | 2 +- 120 files changed, 313 insertions(+), 376 deletions(-) diff --git a/ChangeLog b/ChangeLog index a44ae314d..79592d9c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2001-03-20 David Turner + + * builds/*/*-def.mk: changed the objects directory from "obj" to "objs" + + * include/freetype/config/ftheader.h: removed obsolete macros like + FT_SOURCE_FILE, etc.. and added cache-specific macro definitions that + were previously defined in . Added comments to be + included in a new API Reference section. + + * src/*/*: removed the use of FT_SOURCE_FILE, etc.. now, each component + needs to added its own directory to the include path at compile time. + Modified all "rules.mk" and "descrip.mms" accordingly.. + + 2001-03-20 Werner Lemberg * builds/unix/configure.in: Add $ft_version. @@ -69,8 +83,8 @@ * include/freetype/internal/psaux.h: Changed the lenIV member of the T1_Decoder_ struct to be an FT_Int instead of an FT_UInt. - * src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Adjust - for lenIV seed bytes at the start of a decrypted subroutine. + * src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Adjust + for lenIV seed bytes at the start of a decrypted subroutine. * src/cid/cidload.c (cid_read_subrs): Decrypt subroutines only if lenIV >= 0. diff --git a/builds/ansi/ansi-def.mk b/builds/ansi/ansi-def.mk index df98d1055..9d4685ef1 100644 --- a/builds/ansi/ansi-def.mk +++ b/builds/ansi/ansi-def.mk @@ -34,7 +34,7 @@ PLATFORM := ansi # make -f $TOP/Makefile # ifndef OBJ_DIR - OBJ_DIR := $(TOP)$(SEP)obj + OBJ_DIR := $(TOP)$(SEP)objs endif diff --git a/builds/cygwin/cygwin-def.in b/builds/cygwin/cygwin-def.in index 5fd1d7400..a1c2ae53e 100644 --- a/builds/cygwin/cygwin-def.in +++ b/builds/cygwin/cygwin-def.in @@ -66,7 +66,7 @@ version_info := @version_info@ # make -f $TOP/Makefile # ifndef OBJ_DIR - OBJ_DIR := $(shell cd $(TOP)/obj; pwd) + OBJ_DIR := $(shell cd $(TOP)/objs; pwd) endif diff --git a/builds/cygwin/cygwinddef.mk b/builds/cygwin/cygwinddef.mk index e1e92df6d..b593db5d2 100644 --- a/builds/cygwin/cygwinddef.mk +++ b/builds/cygwin/cygwinddef.mk @@ -33,7 +33,7 @@ PLATFORM := unixdev # The directory where all object files are placed. # ifndef OBJ_DIR - OBJ_DIR := $(shell cd $(TOP)/obj; pwd) + OBJ_DIR := $(shell cd $(TOP)/objs; pwd) endif diff --git a/builds/dos/dos-def.mk b/builds/dos/dos-def.mk index ec7f766b9..19c130165 100644 --- a/builds/dos/dos-def.mk +++ b/builds/dos/dos-def.mk @@ -34,7 +34,7 @@ endif # make -f %TOP%/Makefile # ifndef OBJ_DIR - OBJ_DIR := $(TOP)$(SEP)obj + OBJ_DIR := $(TOP)$(SEP)objs endif diff --git a/builds/freetype.mk b/builds/freetype.mk index 15861ff21..532de0f4b 100644 --- a/builds/freetype.mk +++ b/builds/freetype.mk @@ -130,7 +130,7 @@ PROJECT_LIBRARY := $(LIB_)$(LIBRARY).$A # in the `freetype/builds/' directory, as these # files will override the default sources. # -INCLUDES := $(BUILD) $(TOP)$(SEP)include $(SRC) +INCLUDES := $(BUILD) $(TOP)$(SEP)include INCLUDE_FLAGS = $(INCLUDES:%=$I%) diff --git a/builds/os2/os2-def.mk b/builds/os2/os2-def.mk index b65b591a6..e25f90ce3 100644 --- a/builds/os2/os2-def.mk +++ b/builds/os2/os2-def.mk @@ -34,7 +34,7 @@ endif # make -f %TOP%/Makefile # ifndef OBJ_DIR - OBJ_DIR := $(TOP)$(SEP)obj + OBJ_DIR := $(TOP)$(SEP)objs endif diff --git a/builds/unix/ft2unix.h b/builds/unix/ft2unix.h index b5478cf65..06f72848c 100644 --- a/builds/unix/ft2unix.h +++ b/builds/unix/ft2unix.h @@ -34,7 +34,7 @@ #define FT2_CONFIG_FILE( x ) #define FT2_INTERNAL_FILE( x ) -#include FT2_CONFIG_FILE( ft2build.h ) +#include FT2_CONFIG_FILE( ftheader.h ) #endif /* __FT2_BUILD_UNIX_H__ */ diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in index 1c1ce714a..f7781bc50 100644 --- a/builds/unix/unix-def.in +++ b/builds/unix/unix-def.in @@ -66,7 +66,7 @@ version_info := @version_info@ # make -f $TOP/Makefile # ifndef OBJ_DIR - OBJ_DIR := $(shell cd $(TOP)/obj; pwd) + OBJ_DIR := $(shell cd $(TOP)/objs; pwd) endif diff --git a/builds/unix/unixddef.mk b/builds/unix/unixddef.mk index e1e92df6d..b593db5d2 100644 --- a/builds/unix/unixddef.mk +++ b/builds/unix/unixddef.mk @@ -33,7 +33,7 @@ PLATFORM := unixdev # The directory where all object files are placed. # ifndef OBJ_DIR - OBJ_DIR := $(shell cd $(TOP)/obj; pwd) + OBJ_DIR := $(shell cd $(TOP)/objs; pwd) endif diff --git a/builds/win32/detect.mk b/builds/win32/detect.mk index 5604cec66..54d0a7366 100644 --- a/builds/win32/detect.mk +++ b/builds/win32/detect.mk @@ -86,6 +86,14 @@ ifeq ($(PLATFORM),win32) .PHONY: visualc endif + ifneq ($(findstring intelc,$(MAKECMDGOALS)),) # Intel C/C++ + CONFIG_FILE := w32-intl.mk + SEP := $(BACKSLASH) + CC := cl + visualc: setup + .PHONY: visualc + endif + ifneq ($(findstring watcom,$(MAKECMDGOALS)),) # Watcom C/C++ CONFIG_FILE := w32-wat.mk SEP := $(BACKSLASH) diff --git a/builds/win32/win32-def.mk b/builds/win32/win32-def.mk index eabd59fb3..590237cb1 100644 --- a/builds/win32/win32-def.mk +++ b/builds/win32/win32-def.mk @@ -36,7 +36,7 @@ endif # make -f %TOP%/Makefile # ifndef OBJ_DIR - OBJ_DIR := $(TOP)$(SEP)obj + OBJ_DIR := $(TOP)$(SEP)objs endif diff --git a/include/freetype/config/ftheader.h b/include/freetype/config/ftheader.h index f8c16abb6..51157d082 100644 --- a/include/freetype/config/ftheader.h +++ b/include/freetype/config/ftheader.h @@ -15,134 +15,8 @@ /* */ /***************************************************************************/ - - /*************************************************************************/ - /* */ - /* This file corresponds to the default "ft2build.h" file for */ - /* FreeType 2. It uses the "freetype" include root. */ - /* */ - /* Note that specific platforms might use a different configuration. */ - /* For example, on Unix, the "freetype2" include root could be used, */ - /* with a specific "ft2build.h" to take care of this. The latter then */ - /* looks like the following: */ - /* */ - /* #ifndef __FT2_BUILD_UNIX_H__ */ - /* #define __FT2_BUILD_UNIX_H__ */ - /* */ - /* #define FT2_ROOT freetype2 */ - /* #include */ - /* */ - /* #include FT2_CONFIG_FILE( ft2build.h ) */ - /* */ - /* #endif */ - /* */ - /* If necessary, the macro FT_SOURCE_FILE() can be redefined also if a */ - /* different path separator is needed. */ - /* */ - /*************************************************************************/ - - -#ifndef __FT2_BUILD_H__ -#define __FT2_BUILD_H__ - - - /* this macro is used to enclose its argument in brackets */ -#define FT2_ENCLOSE(x) - - /* this macro is used to join a path and a file name */ -#define FT2_JOINPATH(d,x) d/x - - /* this macro is used to format a path in "" format easily */ -#define FT2_PUBLIC_PATH(d,x) FT2_ENCLOSE(d/x) - - - - /*************************************************************************/ - /* */ - /* The macro FT2_ROOT is used to define the root of all public header */ - /* files for FreeType 2. By default, it is set to "freetype", which */ - /* means that all public files should be included with a line like: */ - /* */ - /* #include */ - /* */ - /* Redefine it to something different if necessary, depending where the */ - /* library is installed on the particular system. */ - /* */ -#ifndef FT2_ROOT -#define FT2_ROOT freetype -#endif - - - /*************************************************************************/ - /* */ - /* The macro FT2_CONFIG_ROOT is used to define the root of all */ - /* configuration header files for FreeType 2. By default, it is set to */ - /* "freetype/config", which means that all config files should be */ - /* include with a line like: */ - /* */ - /* #include */ - /* */ - /* Redefine it to something different, depending where the library is */ - /* installed on the particular system. */ - /* */ -#ifndef FT2_CONFIG_ROOT -#define FT2_CONFIG_ROOT FT2_JOINPATH(FT2_ROOT,config) -#endif - - -#define FT2_INTERNAL_ROOT FT2_JOINPATH(FT2_ROOT,internal) - - /*************************************************************************/ - /* */ - /* The macro FT2_PUBLIC_FILE is used to include a FreeType 2 public file.*/ - /* Its parameter is the file pathname, relative to the public root of a */ - /* given header file. */ - /* */ -#define FT2_PUBLIC_FILE( x ) FT2_PUBLIC_PATH(FT2_ROOT,x) - - - /*************************************************************************/ - /* */ - /* The macro FT2_CONFIG_FILE is used to include a FreeType 2 config file.*/ - /* Its parameter is the file pathname, relative to the configuration */ - /* root directory of a given header file. */ - /* */ -#define FT2_CONFIG_FILE( x ) FT2_PUBLIC_PATH(FT2_CONFIG_ROOT,x) - - - /*************************************************************************/ - /* */ - /* The macro FT2_INTERNAL_FILE is used to include a FreeType 2 internal */ - /* file. Its parameter is the file pathname, relative to the */ - /* configuration root directory of a given header file. */ - /* */ -#define FT2_INTERNAL_FILE( x ) FT2_ENCLOSE(FT2_ROOT/internal/x) - - - /*************************************************************************/ - /* */ - /* The macro FT_SOURCE_FILE is used to include a given FreeType 2 */ - /* component source file (be it a header, a C source file, or an */ - /* included file). */ - /* */ - /* Its first argument is the component/module's directory according to */ - /* the normal FreeType 2 source directory hierarchy, and the second one */ - /* the file name. */ - /* */ - /* Note that you can also put all library source files in a single */ - /* directory and compile them normally by defining the macro */ - /* FT_FLAT_COMPILATION. */ - /* */ -#ifndef FT_SOURCE_FILE - -#ifdef FT_FLAT_COMPILATION -#define FT_SOURCE_FILE( d, x ) #x -#else -#define FT_SOURCE_FILE( d, x ) FT2_PUBLIC_PATH(d,x) -#endif - -#endif /* !FT_SOURCE_FILE */ - +#ifndef __FT_HEADER_H__ +#define __FT_HEADER_H__ /*************************************************************************/ /* */ @@ -431,7 +305,36 @@ * a macro used in #include statements to name the file containing * the API of the optional FreeType 2 cache sub-system. */ -#define FT_CACHE_H +#define FT_CACHE_H + +/************************************************************************* + * + * @macro: FT_CACHE_IMAGE_H + * + * @description: + * a macro used in #include statements to name the file containing + * the "glyph image" API of the FreeType 2 cache sub-system + * + * it is used to define a cache for @FT_Glyph elements. You can also + * see the API defined in @FT_CACHE_SMALL_BITMAPS_H if you only need + * to store small glyph bitmaps, as it will use less memory + */ +#define FT_CACHE_IMAGE_H + +/************************************************************************* + * + * @macro: FT_CACHE_SMALL_BITMAPS_H + * + * @description: + * a macro used in #include statements to name the file containing + * the "small bitmaps" API of the FreeType 2 cache sub-system + * + * it is used to define a cache for small glyph bitmaps in a relatively + * memory-efficient way. You can also use the API defined in + * @FT_CACHE_IMAGE_H if you want to cache arbitrary glyph images, including + * scalable outlines. + */ +#define FT_CACHE_SMALL_BITMAPS_H /************************************************************************* * @@ -466,15 +369,20 @@ * the optional FreeType 2 API used to access embedded "name" strings * in SFNT-based font formats (i.e. TrueType and OpenType) */ -#define FT_NAMES_H +#define FT_NAMES_H /* */ -#define FT_SYNTHESIS_H +#define FT_SYNTHESIS_H +#define FT_CACHE_MANAGER_H + +#define FT_CACHE_INTERNAL_LRU_H +#define FT_CACHE_INTERNAL_GLYPH_H +#define FT_CACHE_INTERNAL_CHUNK_H /* now include internal headers definitions from */ -#define FT_INTERNAL_INTERNAL_H +#define FT_INTERNAL_INTERNAL_H #include FT_INTERNAL_INTERNAL_H diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h index 76d887581..5c3973c34 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h @@ -311,7 +311,7 @@ FT_BEGIN_HEADER /* By undefining this, you will only compile the code necessary to load */ /* TrueType glyphs without hinting. */ /* */ -#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER +#undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER /*************************************************************************/ diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index 0e72a1a05..9bd80bfbf 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -2339,10 +2339,6 @@ FT_BEGIN_HEADER /* */ /* The result of `(a + 0x8000) & -0x10000'. */ /* */ - /* */ - /* This function assumes that the target platform supports 32-bit */ - /* signed integers. */ - /* */ FT_EXPORT( FT_Fixed ) FT_RoundFix( FT_Fixed a ); @@ -2361,10 +2357,6 @@ FT_BEGIN_HEADER /* */ /* The result of `(a + 0x10000 - 1) & -0x10000'. */ /* */ - /* */ - /* This function assumes that the target platform supports 32-bit */ - /* signed integers. */ - /* */ FT_EXPORT( FT_Fixed ) FT_CeilFix( FT_Fixed a ); @@ -2383,10 +2375,6 @@ FT_BEGIN_HEADER /* */ /* The result of `a & -0x10000'. */ /* */ - /* */ - /* This function assumes that the target platform supports 32-bit */ - /* signed integers. */ - /* */ FT_EXPORT( FT_Fixed ) FT_FloorFix( FT_Fixed a ); diff --git a/include/freetype/ftcache.h b/include/freetype/ftcache.h index cedf6d906..64d0c44d1 100644 --- a/include/freetype/ftcache.h +++ b/include/freetype/ftcache.h @@ -42,15 +42,6 @@ FT_BEGIN_HEADER -#define FT_CACHE_MANAGER_H FT2_PUBLIC_FILE(cache/ftcmanag.h) -#define FT_CACHE_IMAGE_H FT2_PUBLIC_FILE(cache/ftcimage.h) -#define FT_CACHE_SMALL_BITMAPS_H FT2_PUBLIC_FILE(cache/ftcsbits.h) - -#define FT_CACHE_INTERNAL_LRU_H FT2_PUBLIC_FILE(cache/ftlru.h) -#define FT_CACHE_INTERNAL_GLYPH_H FT2_PUBLIC_FILE(cache/ftcglyph.h) -#define FT_CACHE_INTERNAL_CHUNK_H FT2_PUBLIC_FILE(cache/ftcchunk.h) - - /*************************************************************************/ /* */ /*
*/ diff --git a/include/freetype/fttypes.h b/include/freetype/fttypes.h index 607ba4322..9f80951c7 100644 --- a/include/freetype/fttypes.h +++ b/include/freetype/fttypes.h @@ -55,6 +55,8 @@ FT_BEGIN_HEADER /* FT_Long */ /* FT_ULong */ /* FT_Bool */ + /* FT_Offset */ + /* FT_PtrDist */ /* FT_Error */ /* FT_Fixed */ /* FT_Pointer */ @@ -268,6 +270,32 @@ FT_BEGIN_HEADER typedef void* FT_Pointer; + /*************************************************************************/ + /* */ + /* */ + /* FT_Offset */ + /* */ + /* */ + /* This is equivalent to the ANSI C "size_t" type, i.e. it's the */ + /* largest _unsigned_ integer type used to express a file size or */ + /* position, or a memory block size. */ + /* */ + typedef size_t FT_Offset; + + + /*************************************************************************/ + /* */ + /* */ + /* FT_PtrDist */ + /* */ + /* */ + /* This is equivalent to the ANSI C "ptrdiff_t" type, i.e. the */ + /* largest _signed_ integer type used to express the distance */ + /* between two pointers. */ + /* */ + typedef size_t FT_PtrDist; + + /*************************************************************************/ /* */ /* */ diff --git a/src/autohint/ahangles.c b/src/autohint/ahangles.c index 812b02130..3f1b43cd4 100644 --- a/src/autohint/ahangles.c +++ b/src/autohint/ahangles.c @@ -21,7 +21,7 @@ #include -#include FT_SOURCE_FILE(autohint,ahangles.h) +#include "ahangles.h" /* the following table has been automatically generated with */ diff --git a/src/autohint/ahangles.h b/src/autohint/ahangles.h index 30f9886d0..f66ad1795 100644 --- a/src/autohint/ahangles.h +++ b/src/autohint/ahangles.h @@ -26,7 +26,7 @@ #include #include FT_INTERNAL_OBJECTS_H -#include FT_SOURCE_FILE(autohint,ahtypes.h) +#include "ahtypes.h" FT_BEGIN_HEADER diff --git a/src/autohint/ahglobal.c b/src/autohint/ahglobal.c index 58c812212..68f68c40a 100644 --- a/src/autohint/ahglobal.c +++ b/src/autohint/ahglobal.c @@ -20,8 +20,8 @@ #include -#include FT_SOURCE_FILE(autohint,ahglobal.h) -#include FT_SOURCE_FILE(autohint,ahglyph.h) +#include "ahglobal.h" +#include "ahglyph.h" #define MAX_TEST_CHARACTERS 12 diff --git a/src/autohint/ahglobal.h b/src/autohint/ahglobal.h index f63462d92..e2cce0e13 100644 --- a/src/autohint/ahglobal.h +++ b/src/autohint/ahglobal.h @@ -25,7 +25,7 @@ #include -#include FT_SOURCE_FILE(autohint,ahtypes.h) +#include "ahtypes.h" #include FT_INTERNAL_OBJECTS_H diff --git a/src/autohint/ahglyph.c b/src/autohint/ahglyph.c index 1752dc7ac..23c26ed59 100644 --- a/src/autohint/ahglyph.c +++ b/src/autohint/ahglyph.c @@ -21,9 +21,9 @@ #include -#include FT_SOURCE_FILE(autohint,ahglyph.h) -#include FT_SOURCE_FILE(autohint,ahangles.h) -#include FT_SOURCE_FILE(autohint,ahglobal.h) +#include "ahglyph.h" +#include "ahangles.h" +#include "ahglobal.h" #include diff --git a/src/autohint/ahglyph.h b/src/autohint/ahglyph.h index 4a19104d4..d91065165 100644 --- a/src/autohint/ahglyph.h +++ b/src/autohint/ahglyph.h @@ -25,7 +25,7 @@ #include -#include FT_SOURCE_FILE(autohint,ahtypes.h) +#include "ahtypes.h" FT_BEGIN_HEADER diff --git a/src/autohint/ahhint.c b/src/autohint/ahhint.c index 64ace0077..754687c3a 100644 --- a/src/autohint/ahhint.c +++ b/src/autohint/ahhint.c @@ -20,9 +20,9 @@ #include -#include FT_SOURCE_FILE(autohint,ahhint.h) -#include FT_SOURCE_FILE(autohint,ahglyph.h) -#include FT_SOURCE_FILE(autohint,ahangles.h) +#include "ahhint.h" +#include "ahglyph.h" +#include "ahangles.h" #include FT_OUTLINE_H diff --git a/src/autohint/ahhint.h b/src/autohint/ahhint.h index 777155baa..fbd7230cf 100644 --- a/src/autohint/ahhint.h +++ b/src/autohint/ahhint.h @@ -24,7 +24,7 @@ #include -#include FT_SOURCE_FILE(autohint,ahglobal.h) +#include "ahglobal.h" FT_BEGIN_HEADER diff --git a/src/autohint/ahmodule.c b/src/autohint/ahmodule.c index f1a2564a0..344975241 100644 --- a/src/autohint/ahmodule.c +++ b/src/autohint/ahmodule.c @@ -21,7 +21,7 @@ #include #include FT_MODULE_H -#include FT_SOURCE_FILE(autohint,ahhint.h) +#include "ahhint.h" typedef struct FT_AutoHinterRec_ diff --git a/src/autohint/ahoptim.c b/src/autohint/ahoptim.c index 910d635d5..848526c2b 100644 --- a/src/autohint/ahoptim.c +++ b/src/autohint/ahoptim.c @@ -33,7 +33,7 @@ #include #include FT_INTERNAL_OBJECTS_H /* for ALLOC_ARRAY() and FREE() */ -#include FT_SOURCE_FILE(autohint,ahoptim.h) +#include "ahoptim.h" /* define this macro to use brute force optimisation -- this is slow, */ diff --git a/src/autohint/ahoptim.h b/src/autohint/ahoptim.h index b45366c47..29b9c38c9 100644 --- a/src/autohint/ahoptim.h +++ b/src/autohint/ahoptim.h @@ -24,7 +24,7 @@ #include -#include FT_SOURCE_FILE(autohint,ahtypes.h) +#include "ahtypes.h" FT_BEGIN_HEADER diff --git a/src/autohint/ahtypes.h b/src/autohint/ahtypes.h index 5d943306d..11b7519f7 100644 --- a/src/autohint/ahtypes.h +++ b/src/autohint/ahtypes.h @@ -26,7 +26,7 @@ #include #include FT_INTERNAL_OBJECTS_H -#include FT_SOURCE_FILE(autohint,ahloader.h) +#include "ahloader.h" #define xxAH_DEBUG diff --git a/src/autohint/autohint.c b/src/autohint/autohint.c index a06eac535..45ac2c27c 100644 --- a/src/autohint/autohint.c +++ b/src/autohint/autohint.c @@ -22,11 +22,11 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT #include -#include FT_SOURCE_FILE(autohint,ahangles.c) -#include FT_SOURCE_FILE(autohint,ahglyph.c) -#include FT_SOURCE_FILE(autohint,ahglobal.c) -#include FT_SOURCE_FILE(autohint,ahhint.c) -#include FT_SOURCE_FILE(autohint,ahmodule.c) +#include "ahangles.c" +#include "ahglyph.c" +#include "ahglobal.c" +#include "ahhint.c" +#include "ahmodule.c" /* END */ diff --git a/src/autohint/descrip.mms b/src/autohint/descrip.mms index 80b4f7f5c..cce93a48f 100644 --- a/src/autohint/descrip.mms +++ b/src/autohint/descrip.mms @@ -15,7 +15,7 @@ # Note that this license is compatible with the FreeType license. -CFLAGS=$(COMP_FLAGS)$(DEBUG)/incl=[--.include] +CFLAGS=$(COMP_FLAGS)$(DEBUG)/incl=([--.include],[--.src.autohint]) OBJS=autohint.obj diff --git a/src/autohint/rules.mk b/src/autohint/rules.mk index 87f7849ad..c6f275bf0 100644 --- a/src/autohint/rules.mk +++ b/src/autohint/rules.mk @@ -24,7 +24,7 @@ AUTO_DIR_ := $(AUTO_DIR)$(SEP) # compilation flags for the driver # -AUTO_COMPILE := $(FT_COMPILE) +AUTO_COMPILE := $(FT_COMPILE) $I$(AUTO_DIR) # AUTO driver sources (i.e., C files) diff --git a/src/base/descrip.mms b/src/base/descrip.mms index 9c4bfb728..f650ced6e 100644 --- a/src/base/descrip.mms +++ b/src/base/descrip.mms @@ -13,7 +13,7 @@ # fully. -CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.builds.vms],[--.include]) +CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.builds.vms],[--.include],[--.src.base]) OBJS=ftbase.obj,ftinit.obj,ftglyph.obj diff --git a/src/base/ftbase.c b/src/base/ftbase.c index 391870081..1d61b5aa8 100644 --- a/src/base/ftbase.c +++ b/src/base/ftbase.c @@ -17,13 +17,18 @@ #include -#include FT_SOURCE_FILE(base,ftcalc.c) -#include FT_SOURCE_FILE(base,ftobjs.c) -#include FT_SOURCE_FILE(base,ftstream.c) -#include FT_SOURCE_FILE(base,ftlist.c) -#include FT_SOURCE_FILE(base,ftoutln.c) -#include FT_SOURCE_FILE(base,ftextend.c) -#include FT_SOURCE_FILE(base,ftnames.c) +#define FT_MAKE_OPTION_SINGLE_OBJECT + +#include "ftcalc.c" +#include "ftobjs.c" +#include "ftstream.c" +#include "ftlist.c" +#include "ftoutln.c" +#include "ftnames.c" + +#if 0 +#include "ftextend.c" +#endif /* END */ diff --git a/src/base/ftmac.c b/src/base/ftmac.c index 8f7e7a0fe..fff02f401 100644 --- a/src/base/ftmac.c +++ b/src/base/ftmac.c @@ -60,8 +60,8 @@ #include #include FT_FREETYPE_H #include FT_INTERNAL_STREAM_H -#include FT_SOURCE_FILE( truetype, ttobjs.h ) -#include FT_SOURCE_FILE( type1, t1objs.h ) +#include "truetype/ttobjs.h" +#include "type1/t1objs.h" #include #include diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index a0c6713d7..03fe64e10 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -2079,10 +2079,10 @@ } - FT_LOCAL_DEF - FT_Error FT_Render_Glyph_Internal( FT_Library library, - FT_GlyphSlot slot, - FT_UInt render_mode ) + FT_EXPORT_DEF(FT_Error) + FT_Render_Glyph_Internal( FT_Library library, + FT_GlyphSlot slot, + FT_UInt render_mode ) { FT_Error error = FT_Err_Ok; FT_Renderer renderer; diff --git a/src/cache/descrip.mms b/src/cache/descrip.mms index 0c5929512..b87c1c6f9 100644 --- a/src/cache/descrip.mms +++ b/src/cache/descrip.mms @@ -13,7 +13,7 @@ # fully. -CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include] +CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.cache]) OBJS=ftcache.obj diff --git a/src/cache/ftcache.c b/src/cache/ftcache.c index b9ebbb7e5..324d1b6e0 100644 --- a/src/cache/ftcache.c +++ b/src/cache/ftcache.c @@ -19,12 +19,12 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT #include -#include FT_SOURCE_FILE(cache,ftlru.c) -#include FT_SOURCE_FILE(cache,ftcmanag.c) -#include FT_SOURCE_FILE(cache,ftcglyph.c) -#include FT_SOURCE_FILE(cache,ftcchunk.c) -#include FT_SOURCE_FILE(cache,ftcimage.c) -#include FT_SOURCE_FILE(cache,ftcsbits.c) +#include "ftlru.c" +#include "ftcmanag.c" +#include "ftcglyph.c" +#include "ftcchunk.c" +#include "ftcimage.c" +#include "ftcsbits.c" /* END */ diff --git a/src/cache/rules.mk b/src/cache/rules.mk index 086b0995d..a83416a32 100644 --- a/src/cache/rules.mk +++ b/src/cache/rules.mk @@ -23,7 +23,7 @@ CACHE_H_DIR_ := $(CACHE_H_DIR)$(SEP) # compilation flags for the driver # -Cache_COMPILE := $(FT_COMPILE) +Cache_COMPILE := $(FT_COMPILE) $I$(CACHE_DIR) # Cache driver sources (i.e., C files) diff --git a/src/cff/cff.c b/src/cff/cff.c index 2c6c1df91..6ac61f767 100644 --- a/src/cff/cff.c +++ b/src/cff/cff.c @@ -19,11 +19,11 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT #include -#include FT_SOURCE_FILE(cff,cffdrivr.c) -#include FT_SOURCE_FILE(cff,cffparse.c) -#include FT_SOURCE_FILE(cff,cffload.c) -#include FT_SOURCE_FILE(cff,cffobjs.c) -#include FT_SOURCE_FILE(cff,cffgload.c) +#include "cffdrivr.c" +#include "cffparse.c" +#include "cffload.c" +#include "cffobjs.c" +#include "cffgload.c" /* END */ diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c index e701f3f31..f195c3da6 100644 --- a/src/cff/cffdrivr.c +++ b/src/cff/cffdrivr.c @@ -24,9 +24,9 @@ #include FT_TRUETYPE_NAMES_H #include FT_INTERNAL_CFF_ERRORS_H -#include FT_SOURCE_FILE(cff,cffdrivr.h) -#include FT_SOURCE_FILE(cff,cffgload.h) -#include FT_SOURCE_FILE(cff,cffload.h) +#include "cffdrivr.h" +#include "cffgload.h" +#include "cffload.h" /*************************************************************************/ /* */ diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c index 7337bf4af..e60203436 100644 --- a/src/cff/cffgload.c +++ b/src/cff/cffgload.c @@ -24,8 +24,8 @@ #include FT_OUTLINE_H #include FT_TRUETYPE_TAGS_H -#include FT_SOURCE_FILE(cff,cffload.h) -#include FT_SOURCE_FILE(cff,cffgload.h) +#include "cffload.h" +#include "cffgload.h" #include FT_INTERNAL_CFF_ERRORS_H @@ -74,7 +74,7 @@ cff_op_hintmask, cff_op_cntrmask, - cff_op_dotsection, + cff_op_dotsection, /* deprecated, acts as no-op */ cff_op_abs, cff_op_add, @@ -1092,11 +1092,6 @@ args = stack; break; - case cff_op_dotsection: - - FT_TRACE4(( " dotsection" )); - break; - case cff_op_rmoveto: FT_TRACE4(( " rmoveto" )); @@ -1843,6 +1838,13 @@ goto Unimplemented; + case cff_op_dotsection: + { + /* this operator is deprecated and ignored by the parser */ + FT_TRACE4(( " dotsection" )); + } + break; + case cff_op_and: { FT_Fixed cond = args[0] && args[1]; diff --git a/src/cff/cffgload.h b/src/cff/cffgload.h index fb0727455..988ff4d23 100644 --- a/src/cff/cffgload.h +++ b/src/cff/cffgload.h @@ -22,7 +22,7 @@ #include #include FT_FREETYPE_H -#include FT_SOURCE_FILE(cff,cffobjs.h) +#include "cffobjs.h" FT_BEGIN_HEADER diff --git a/src/cff/cffload.c b/src/cff/cffload.c index 0fa821027..2dd072836 100644 --- a/src/cff/cffload.c +++ b/src/cff/cffload.c @@ -8,7 +8,7 @@ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ -/* modified, and distributed under the terms of the FreeType project */ +/* modified, and xdistributed under the terms of the FreeType project */ /* license, LICENSE.TXT. By continuing to use, modify, or distribute */ /* this file you indicate that you have read the license and */ /* understand and accept it fully. */ @@ -24,8 +24,8 @@ #include FT_INTERNAL_CFF_ERRORS_H #include FT_TRUETYPE_TAGS_H -#include FT_SOURCE_FILE(cff,cffload.h) -#include FT_SOURCE_FILE(cff,cffparse.h) +#include "cffload.h" +#include "cffparse.h" /*************************************************************************/ @@ -1790,7 +1790,7 @@ for ( k = i; k < nleft + i; k++, glyph_code++ ) { /* Make sure k is not too big. */ - if ( k > num_glyphs ) + if ( (FT_UInt)k > num_glyphs ) goto Exit; /* Assign code to GID mapping. */ diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c index 5ceb78c76..882d5e03c 100644 --- a/src/cff/cffobjs.c +++ b/src/cff/cffobjs.c @@ -25,8 +25,8 @@ #include FT_TRUETYPE_TAGS_H #include FT_INTERNAL_SFNT_H #include FT_INTERNAL_POSTSCRIPT_NAMES_H -#include FT_SOURCE_FILE(cff,cffobjs.h) -#include FT_SOURCE_FILE(cff,cffload.h) +#include "cffobjs.h" +#include "cffload.h" #include FT_INTERNAL_CFF_ERRORS_H #include /* for strlen() */ @@ -388,8 +388,8 @@ /* set global bbox, as well as EM size */ root->bbox = dict->font_bbox; - root->ascender = root->bbox.yMax >> 16; - root->descender = root->bbox.yMin >> 16; + root->ascender = (FT_Short)(root->bbox.yMax >> 16); + root->descender = (FT_Short)(root->bbox.yMin >> 16); root->height = ( ( root->ascender - root->descender ) * 12 ) / 10; if ( dict->units_per_em ) diff --git a/src/cff/cffparse.c b/src/cff/cffparse.c index ec20f3ed1..da53be53f 100644 --- a/src/cff/cffparse.c +++ b/src/cff/cffparse.c @@ -17,7 +17,7 @@ #include -#include FT_SOURCE_FILE(cff,cffparse.h) +#include "cffparse.h" #include FT_INTERNAL_CFF_ERRORS_H #include FT_INTERNAL_STREAM_H @@ -477,7 +477,7 @@ static const CFF_Field_Handler cff_field_handlers[] = { -#include FT_SOURCE_FILE(cff,cfftoken.h) +#include "cfftoken.h" { 0, 0, 0, 0, 0, 0, 0 } }; diff --git a/src/cff/descrip.mms b/src/cff/descrip.mms index d51f7eeab..b4a99d196 100644 --- a/src/cff/descrip.mms +++ b/src/cff/descrip.mms @@ -13,7 +13,7 @@ # fully. -CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include] +CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.cff]) OBJS=cff.obj diff --git a/src/cff/rules.mk b/src/cff/rules.mk index 5a0a67eb1..f87634f62 100644 --- a/src/cff/rules.mk +++ b/src/cff/rules.mk @@ -19,7 +19,7 @@ CFF_DIR := $(SRC_)cff CFF_DIR_ := $(CFF_DIR)$(SEP) -CFF_COMPILE := $(FT_COMPILE) +CFF_COMPILE := $(FT_COMPILE) $I$(CFF_DIR) # CFF driver sources (i.e., C files) diff --git a/src/cid/cidgload.c b/src/cid/cidgload.c index 7ca0c441f..27327840e 100644 --- a/src/cid/cidgload.c +++ b/src/cid/cidgload.c @@ -17,8 +17,8 @@ #include -#include FT_SOURCE_FILE(cid,cidload.h) -#include FT_SOURCE_FILE(cid,cidgload.h) +#include "cidload.h" +#include "cidgload.h" #include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_STREAM_H #include FT_OUTLINE_H diff --git a/src/cid/cidgload.h b/src/cid/cidgload.h index a894d97f3..44aed0f66 100644 --- a/src/cid/cidgload.h +++ b/src/cid/cidgload.h @@ -21,7 +21,7 @@ #include -#include FT_SOURCE_FILE(cid,cidobjs.h) +#include "cidobjs.h" FT_BEGIN_HEADER diff --git a/src/cid/cidload.c b/src/cid/cidload.c index 03343e241..06bdffe50 100644 --- a/src/cid/cidload.c +++ b/src/cid/cidload.c @@ -22,7 +22,7 @@ #include FT_MULTIPLE_MASTERS_H #include FT_INTERNAL_TYPE1_TYPES_H #include FT_INTERNAL_TYPE1_ERRORS_H -#include FT_SOURCE_FILE(cid,cidload.h) +#include "cidload.h" #include #include /* for isspace(), isalnum() */ @@ -271,16 +271,8 @@ const T1_Field cid_field_records[] = { -#ifdef FT_FLAT_COMPILE - #include "cidtokens.h" -#else - -#include - -#endif - T1_FIELD_CALLBACK( "FontBBox", parse_font_bbox ) T1_FIELD_CALLBACK( "FDArray", parse_fd_array ) T1_FIELD_CALLBACK( "FontMatrix", parse_font_matrix ) diff --git a/src/cid/cidload.h b/src/cid/cidload.h index d52090499..cbd223536 100644 --- a/src/cid/cidload.h +++ b/src/cid/cidload.h @@ -22,7 +22,7 @@ #include #include FT_INTERNAL_STREAM_H -#include FT_SOURCE_FILE(cid,cidparse.h) +#include "cidparse.h" FT_BEGIN_HEADER diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c index 1d8752724..4fe8c29c5 100644 --- a/src/cid/cidobjs.c +++ b/src/cid/cidobjs.c @@ -19,8 +19,8 @@ #include #include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_STREAM_H -#include FT_SOURCE_FILE(cid,cidgload.h) -#include FT_SOURCE_FILE(cid,cidload.h) +#include "cidgload.h" +#include "cidload.h" #include FT_INTERNAL_POSTSCRIPT_NAMES_H #include FT_INTERNAL_POSTSCRIPT_AUX_H diff --git a/src/cid/cidparse.c b/src/cid/cidparse.c index c8cff5ecf..6f0b2ca06 100644 --- a/src/cid/cidparse.c +++ b/src/cid/cidparse.c @@ -22,7 +22,7 @@ #include FT_INTERNAL_OBJECTS_H #include FT_INTERNAL_STREAM_H #include FT_INTERNAL_TYPE1_ERRORS_H -#include FT_SOURCE_FILE(cid,cidparse.h) +#include "cidparse.h" #include /* for strncmp() */ diff --git a/src/cid/cidriver.c b/src/cid/cidriver.c index d916dab11..c86f0a2e6 100644 --- a/src/cid/cidriver.c +++ b/src/cid/cidriver.c @@ -17,8 +17,8 @@ #include -#include FT_SOURCE_FILE(cid,cidriver.h) -#include FT_SOURCE_FILE(cid,cidgload.h) +#include "cidriver.h" +#include "cidgload.h" #include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_STREAM_H #include FT_INTERNAL_POSTSCRIPT_NAMES_H diff --git a/src/cid/descrip.mms b/src/cid/descrip.mms index 1e261a755..1502e422a 100644 --- a/src/cid/descrip.mms +++ b/src/cid/descrip.mms @@ -13,7 +13,7 @@ # fully. -CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include] +CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.cid]) OBJS=type1cid.obj diff --git a/src/cid/rules.mk b/src/cid/rules.mk index cbaaec768..d7ab02660 100644 --- a/src/cid/rules.mk +++ b/src/cid/rules.mk @@ -19,7 +19,7 @@ CID_DIR := $(SRC_)cid CID_DIR_ := $(CID_DIR)$(SEP) -CID_COMPILE := $(FT_COMPILE) +CID_COMPILE := $(FT_COMPILE) $I$(CID_DIR) # CID driver sources (i.e., C files) diff --git a/src/cid/type1cid.c b/src/cid/type1cid.c index f27a49912..852eca18c 100644 --- a/src/cid/type1cid.c +++ b/src/cid/type1cid.c @@ -19,11 +19,11 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT #include -#include FT_SOURCE_FILE(cid,cidparse.c) -#include FT_SOURCE_FILE(cid,cidload.c) -#include FT_SOURCE_FILE(cid,cidobjs.c) -#include FT_SOURCE_FILE(cid,cidriver.c) -#include FT_SOURCE_FILE(cid,cidgload.c) +#include "cidparse.c" +#include "cidload.c" +#include "cidobjs.c" +#include "cidriver.c" +#include "cidgload.c" /* END */ diff --git a/src/pcf/descrip.mms b/src/pcf/descrip.mms index d576ddc22..c9dd63864 100644 --- a/src/pcf/descrip.mms +++ b/src/pcf/descrip.mms @@ -25,7 +25,7 @@ # THE SOFTWARE. -CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include] +CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.pcf]) OBJS=pcf.obj diff --git a/src/pcf/pcf.c b/src/pcf/pcf.c index e606b7cca..ccd1ead9c 100644 --- a/src/pcf/pcf.c +++ b/src/pcf/pcf.c @@ -29,8 +29,8 @@ THE SOFTWARE. #include -#include FT_SOURCE_FILE(pcf,pcfutil.c) -#include FT_SOURCE_FILE(pcf,pcfread.c) -#include FT_SOURCE_FILE(pcf,pcfdriver.c) +#include "pcfutil.c" +#include "pcfread.c" +#include "pcfdriver.c" /* END */ diff --git a/src/pcf/pcf.h b/src/pcf/pcf.h index de45fec70..af1d8fe0c 100644 --- a/src/pcf/pcf.h +++ b/src/pcf/pcf.h @@ -226,7 +226,7 @@ FT_BEGIN_HEADER #define GLYPHPADOPTIONS 4 /* I'm not sure about this */ - static + FT_LOCAL FT_Error pcf_load_font( FT_Stream, PCF_Face ); diff --git a/src/pcf/pcfdriver.c b/src/pcf/pcfdriver.c index 248b89db2..59e7dc3b2 100644 --- a/src/pcf/pcfdriver.c +++ b/src/pcf/pcfdriver.c @@ -32,9 +32,9 @@ THE SOFTWARE. #include FT_INTERNAL_STREAM_H #include FT_INTERNAL_OBJECTS_H -#include FT_SOURCE_FILE(pcf,pcf.h) -#include FT_SOURCE_FILE(pcf,pcfdriver.h) -#include FT_SOURCE_FILE(pcf,pcfutil.h) +#include "pcf.h" +#include "pcfdriver.h" +#include "pcfutil.h" /*************************************************************************/ diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c index cf2c28a53..0b7d35868 100644 --- a/src/pcf/pcfread.c +++ b/src/pcf/pcfread.c @@ -32,8 +32,8 @@ THE SOFTWARE. #include FT_INTERNAL_STREAM_H #include FT_INTERNAL_OBJECTS_H -#include FT_SOURCE_FILE(pcf,pcf.h) -#include FT_SOURCE_FILE(pcf,pcfdriver.h) +#include "pcf.h" +#include "pcfdriver.h" #include /* strlen(), strcpy() */ @@ -856,6 +856,7 @@ THE SOFTWARE. } + FT_LOCAL_DEF FT_Error pcf_load_font( FT_Stream stream, PCF_Face face ) { diff --git a/src/pcf/pcfutil.c b/src/pcf/pcfutil.c index e0253ca71..ca0c7c1ee 100644 --- a/src/pcf/pcfutil.c +++ b/src/pcf/pcfutil.c @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. #include -#include FT_SOURCE_FILE(pcf,pcfutil.h) +#include "pcfutil.h" /* Utility functions for reformatting font bitmaps */ diff --git a/src/pcf/rules.mk b/src/pcf/rules.mk index d2fd9cc98..67a0dce2e 100644 --- a/src/pcf/rules.mk +++ b/src/pcf/rules.mk @@ -31,7 +31,7 @@ PCF_DIR := $(SRC_)pcf PCF_DIR_ := $(PCF_DIR)$(SEP) -PCF_COMPILE := $(FT_COMPILE) +PCF_COMPILE := $(FT_COMPILE) $I$(PCF_DIR) # pcf driver sources (i.e., C files) diff --git a/src/psaux/descrip.mms b/src/psaux/descrip.mms index 8f0e490c4..d3ed754b0 100644 --- a/src/psaux/descrip.mms +++ b/src/psaux/descrip.mms @@ -13,7 +13,7 @@ # fully. -CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include] +CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.psaux]) OBJS=psaux.obj diff --git a/src/psaux/psaux.c b/src/psaux/psaux.c index c0119a80c..9275e0213 100644 --- a/src/psaux/psaux.c +++ b/src/psaux/psaux.c @@ -19,9 +19,9 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT #include -#include FT_SOURCE_FILE(psaux,psobjs.c) -#include FT_SOURCE_FILE(psaux,psauxmod.c) -#include FT_SOURCE_FILE(psaux,t1decode.c) +#include "psobjs.c" +#include "psauxmod.c" +#include "t1decode.c" /* END */ diff --git a/src/psaux/psauxmod.c b/src/psaux/psauxmod.c index d8f436c14..f752372c2 100644 --- a/src/psaux/psauxmod.c +++ b/src/psaux/psauxmod.c @@ -17,9 +17,9 @@ #include -#include FT_SOURCE_FILE(psaux,psauxmod.h) -#include FT_SOURCE_FILE(psaux,psobjs.h) -#include FT_SOURCE_FILE(psaux,t1decode.h) +#include "psauxmod.h" +#include "psobjs.h" +#include "t1decode.h" FT_CALLBACK_TABLE_DEF diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c index 754626131..abca45a30 100644 --- a/src/psaux/psobjs.c +++ b/src/psaux/psobjs.c @@ -20,7 +20,7 @@ #include FT_INTERNAL_POSTSCRIPT_AUX_H #include FT_INTERNAL_DEBUG_H #include FT_ERRORS_H -#include FT_SOURCE_FILE(psaux,psobjs.h) +#include "psobjs.h" /*************************************************************************/ diff --git a/src/psaux/rules.mk b/src/psaux/rules.mk index ae182e243..dd5c8a6eb 100644 --- a/src/psaux/rules.mk +++ b/src/psaux/rules.mk @@ -21,7 +21,7 @@ PSAUX_DIR_ := $(PSAUX_DIR)$(SEP) # compilation flags for the driver # -PSAUX_COMPILE := $(FT_COMPILE) +PSAUX_COMPILE := $(FT_COMPILE) $I$(PSAUX_DIR) # PSAUX driver sources (i.e., C files) diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c index 54e9caded..a19807e7a 100644 --- a/src/psaux/t1decode.c +++ b/src/psaux/t1decode.c @@ -20,8 +20,8 @@ #include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_TYPE1_ERRORS_H #include FT_OUTLINE_H -#include FT_SOURCE_FILE(psaux,t1decode.h) -#include FT_SOURCE_FILE(psaux,psobjs.h) +#include "t1decode.h" +#include "psobjs.h" /*************************************************************************/ diff --git a/src/psnames/descrip.mms b/src/psnames/descrip.mms index a21e704ff..bb86c547e 100644 --- a/src/psnames/descrip.mms +++ b/src/psnames/descrip.mms @@ -13,7 +13,7 @@ # fully. -CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include] +CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.psnames]) OBJS=psnames.obj diff --git a/src/psnames/psmodule.c b/src/psnames/psmodule.c index 2160c5d1c..389e1a0ef 100644 --- a/src/psnames/psmodule.c +++ b/src/psnames/psmodule.c @@ -19,8 +19,8 @@ #include #include FT_INTERNAL_POSTSCRIPT_NAMES_H #include FT_INTERNAL_OBJECTS_H -#include FT_SOURCE_FILE(psnames,psmodule.h) -#include FT_SOURCE_FILE(psnames,pstables.h) +#include "psmodule.h" +#include "pstables.h" #include /* for qsort() */ #include /* for strcmp(), strncpy() */ diff --git a/src/psnames/psnames.c b/src/psnames/psnames.c index 07b5e1554..6e482ff2e 100644 --- a/src/psnames/psnames.c +++ b/src/psnames/psnames.c @@ -19,7 +19,7 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT #include -#include FT_SOURCE_FILE(psnames,psmodule.c) +#include "psmodule.c" /* END */ diff --git a/src/psnames/rules.mk b/src/psnames/rules.mk index 25552b266..7612e8286 100644 --- a/src/psnames/rules.mk +++ b/src/psnames/rules.mk @@ -21,7 +21,7 @@ PSNAMES_DIR_ := $(PSNAMES_DIR)$(SEP) # compilation flags for the driver # -PSNAMES_COMPILE := $(FT_COMPILE) +PSNAMES_COMPILE := $(FT_COMPILE) $I$(PSNAMES_DIR) # PSNames driver sources (i.e., C files) diff --git a/src/raster/descrip.mms b/src/raster/descrip.mms index 03c48b7e1..ea42a4bbd 100644 --- a/src/raster/descrip.mms +++ b/src/raster/descrip.mms @@ -13,7 +13,7 @@ # fully. -CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include] +CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.raster]) OBJS=raster.obj diff --git a/src/raster/ftraster.c b/src/raster/ftraster.c index 993fd1110..ef35b8072 100644 --- a/src/raster/ftraster.c +++ b/src/raster/ftraster.c @@ -23,7 +23,7 @@ #include -#include FT_SOURCE_FILE(raster,ftraster.h) +#include "ftraster.h" #include FT_INTERNAL_CALC_H /* for FT_MulDiv only */ diff --git a/src/raster/ftrend1.c b/src/raster/ftrend1.c index 81931f085..19c741c93 100644 --- a/src/raster/ftrend1.c +++ b/src/raster/ftrend1.c @@ -19,8 +19,8 @@ #include #include FT_INTERNAL_OBJECTS_H #include FT_OUTLINE_H -#include FT_SOURCE_FILE(raster,ftrend1.h) -#include FT_SOURCE_FILE(raster,ftraster.h) +#include "ftrend1.h" +#include "ftraster.h" /* initialize renderer -- init its raster */ diff --git a/src/raster/raster.c b/src/raster/raster.c index 96894a5b4..9dc2a86fb 100644 --- a/src/raster/raster.c +++ b/src/raster/raster.c @@ -19,8 +19,8 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT #include -#include FT_SOURCE_FILE(raster,ftraster.c) -#include FT_SOURCE_FILE(raster,ftrend1.c) +#include "ftraster.c" +#include "ftrend1.c" /* END */ diff --git a/src/raster/rules.mk b/src/raster/rules.mk index 32dbf699f..2dba01396 100644 --- a/src/raster/rules.mk +++ b/src/raster/rules.mk @@ -20,7 +20,7 @@ RAS1_DIR_ := $(RAS1_DIR)$(SEP) # compilation flags for the driver # -RAS1_COMPILE := $(FT_COMPILE) +RAS1_COMPILE := $(FT_COMPILE) $I$(RAS1_DIR) # raster1 driver sources (i.e., C files) diff --git a/src/sfnt/descrip.mms b/src/sfnt/descrip.mms index b32c2918e..8eeb2a6aa 100644 --- a/src/sfnt/descrip.mms +++ b/src/sfnt/descrip.mms @@ -13,7 +13,7 @@ # fully. -CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include] +CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.sfnt]) OBJS=sfnt.obj diff --git a/src/sfnt/rules.mk b/src/sfnt/rules.mk index 2255e6a08..4502b5cde 100644 --- a/src/sfnt/rules.mk +++ b/src/sfnt/rules.mk @@ -21,7 +21,7 @@ SFNT_DIR_ := $(SFNT_DIR)$(SEP) # compilation flags for the driver # -SFNT_COMPILE := $(FT_COMPILE) +SFNT_COMPILE := $(FT_COMPILE) $I$(SFNT_DIR) # SFNT driver sources (i.e., C files) diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c index de30fbb69..15411455d 100644 --- a/src/sfnt/sfdriver.c +++ b/src/sfnt/sfdriver.c @@ -20,17 +20,17 @@ #include FT_INTERNAL_SFNT_H #include FT_INTERNAL_OBJECTS_H -#include FT_SOURCE_FILE(sfnt,sfdriver.h) -#include FT_SOURCE_FILE(sfnt,ttload.h) -#include FT_SOURCE_FILE(sfnt,ttcmap.h) -#include FT_SOURCE_FILE(sfnt,sfobjs.h) +#include "sfdriver.h" +#include "ttload.h" +#include "ttcmap.h" +#include "sfobjs.h" #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS -#include FT_SOURCE_FILE(sfnt,ttsbit.h) +#include "ttsbit.h" #endif #ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES -#include FT_SOURCE_FILE(sfnt,ttpost.h) +#include "ttpost.h" #endif #include /* for strcmp() */ diff --git a/src/sfnt/sfnt.c b/src/sfnt/sfnt.c index 91fce49bd..bab7b57c4 100644 --- a/src/sfnt/sfnt.c +++ b/src/sfnt/sfnt.c @@ -19,17 +19,17 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT #include -#include FT_SOURCE_FILE(sfnt,ttload.c) -#include FT_SOURCE_FILE(sfnt,ttcmap.c) -#include FT_SOURCE_FILE(sfnt,sfobjs.c) -#include FT_SOURCE_FILE(sfnt,sfdriver.c) +#include "ttload.c" +#include "ttcmap.c" +#include "sfobjs.c" +#include "sfdriver.c" #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS -#include FT_SOURCE_FILE(sfnt,ttsbit.c) +#include "ttsbit.c" #endif #ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES -#include FT_SOURCE_FILE(sfnt,ttpost.c) +#include "ttpost.c" #endif diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c index e4284a4a6..894ed5291 100644 --- a/src/sfnt/sfobjs.c +++ b/src/sfnt/sfobjs.c @@ -17,8 +17,8 @@ #include -#include FT_SOURCE_FILE(sfnt,sfobjs.h) -#include FT_SOURCE_FILE(sfnt,ttload.h) +#include "sfobjs.h" +#include "ttload.h" #include FT_INTERNAL_SFNT_H #include FT_INTERNAL_POSTSCRIPT_NAMES_H #include FT_TRUETYPE_NAMES_H diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c index 2f2a53a5a..c9eb94694 100644 --- a/src/sfnt/ttcmap.c +++ b/src/sfnt/ttcmap.c @@ -19,8 +19,8 @@ #include #include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_TRUETYPE_ERRORS_H -#include FT_SOURCE_FILE(sfnt,ttload.h) -#include FT_SOURCE_FILE(sfnt,ttcmap.h) +#include "ttload.h" +#include "ttcmap.h" /*************************************************************************/ diff --git a/src/sfnt/ttload.c b/src/sfnt/ttload.c index 572d65bc3..254fc8e51 100644 --- a/src/sfnt/ttload.c +++ b/src/sfnt/ttload.c @@ -22,8 +22,8 @@ #include FT_INTERNAL_TRUETYPE_ERRORS_H #include FT_INTERNAL_STREAM_H #include FT_TRUETYPE_TAGS_H -#include FT_SOURCE_FILE(sfnt,ttload.h) -#include FT_SOURCE_FILE(sfnt,ttcmap.h) +#include "ttload.h" +#include "ttcmap.h" /*************************************************************************/ diff --git a/src/sfnt/ttpost.c b/src/sfnt/ttpost.c index 5fcf0661f..3f85170ad 100644 --- a/src/sfnt/ttpost.c +++ b/src/sfnt/ttpost.c @@ -29,8 +29,8 @@ #include FT_INTERNAL_STREAM_H #include FT_INTERNAL_TRUETYPE_ERRORS_H #include FT_TRUETYPE_TAGS_H -#include FT_SOURCE_FILE(sfnt,ttpost.h) -#include FT_SOURCE_FILE(sfnt,ttload.h) +#include "ttpost.h" +#include "ttload.h" /*************************************************************************/ diff --git a/src/sfnt/ttsbit.c b/src/sfnt/ttsbit.c index 2b637fc3d..ff5fd930f 100644 --- a/src/sfnt/ttsbit.c +++ b/src/sfnt/ttsbit.c @@ -21,7 +21,7 @@ #include FT_INTERNAL_TRUETYPE_ERRORS_H #include FT_INTERNAL_STREAM_H #include FT_TRUETYPE_TAGS_H -#include FT_SOURCE_FILE(sfnt,ttsbit.h) +#include "ttsbit.h" /*************************************************************************/ diff --git a/src/sfnt/ttsbit.h b/src/sfnt/ttsbit.h index bda3829cb..679a1c5d3 100644 --- a/src/sfnt/ttsbit.h +++ b/src/sfnt/ttsbit.h @@ -21,7 +21,7 @@ #include -#include FT_SOURCE_FILE(sfnt,ttload.h) +#include "ttload.h" FT_BEGIN_HEADER diff --git a/src/smooth/descrip.mms b/src/smooth/descrip.mms index 1e534e380..67d62ecd5 100644 --- a/src/smooth/descrip.mms +++ b/src/smooth/descrip.mms @@ -13,7 +13,7 @@ # fully. -CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include] +CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.smooth]) OBJS=smooth.obj diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c index 83eb17e25..6ac2608f7 100644 --- a/src/smooth/ftgrays.c +++ b/src/smooth/ftgrays.c @@ -123,7 +123,7 @@ #else /* _STANDALONE_ */ #include -#include FT_SOURCE_FILE(smooth,ftgrays.h) +#include "ftgrays.h" #include FT_INTERNAL_OBJECTS_H #include FT_INTERNAL_DEBUG_H #include FT_OUTLINE_H diff --git a/src/smooth/ftsmooth.c b/src/smooth/ftsmooth.c index 9e5682172..cc2985d68 100644 --- a/src/smooth/ftsmooth.c +++ b/src/smooth/ftsmooth.c @@ -19,8 +19,8 @@ #include #include FT_INTERNAL_OBJECTS_H #include FT_OUTLINE_H -#include FT_SOURCE_FILE(smooth,ftsmooth.h) -#include FT_SOURCE_FILE(smooth,ftgrays.h) +#include "ftsmooth.h" +#include "ftgrays.h" /* initialize renderer -- init its raster */ diff --git a/src/smooth/rules.mk b/src/smooth/rules.mk index 62febfadd..cf751f592 100644 --- a/src/smooth/rules.mk +++ b/src/smooth/rules.mk @@ -20,7 +20,7 @@ SMOOTH_DIR_ := $(SMOOTH_DIR)$(SEP) # compilation flags for the driver # -SMOOTH_COMPILE := $(FT_COMPILE) +SMOOTH_COMPILE := $(FT_COMPILE) $I$(SMOOTH_DIR) # smooth driver sources (i.e., C files) diff --git a/src/smooth/smooth.c b/src/smooth/smooth.c index aeeb254f0..40639cb0e 100644 --- a/src/smooth/smooth.c +++ b/src/smooth/smooth.c @@ -19,8 +19,8 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT #include -#include FT_SOURCE_FILE(smooth,ftgrays.c) -#include FT_SOURCE_FILE(smooth,ftsmooth.c) +#include "ftgrays.c" +#include "ftsmooth.c" /* END */ diff --git a/src/truetype/descrip.mms b/src/truetype/descrip.mms index d0dda96c1..92ea89a71 100644 --- a/src/truetype/descrip.mms +++ b/src/truetype/descrip.mms @@ -13,7 +13,7 @@ # fully. -CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include] +CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.truetype]) OBJS=truetype.obj diff --git a/src/truetype/rules.mk b/src/truetype/rules.mk index 9289378cb..a9f6c3683 100644 --- a/src/truetype/rules.mk +++ b/src/truetype/rules.mk @@ -21,7 +21,7 @@ TT_DIR_ := $(TT_DIR)$(SEP) # compilation flags for the driver # -TT_COMPILE := $(FT_COMPILE) +TT_COMPILE := $(FT_COMPILE) $I$(TT_DIR) # TrueType driver sources (i.e., C files) diff --git a/src/truetype/truetype.c b/src/truetype/truetype.c index a32c9b0e2..59833e5e3 100644 --- a/src/truetype/truetype.c +++ b/src/truetype/truetype.c @@ -19,13 +19,13 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT #include -#include FT_SOURCE_FILE(truetype,ttdriver.c) /* driver interface */ -#include FT_SOURCE_FILE(truetype,ttpload.c) /* tables loader */ -#include FT_SOURCE_FILE(truetype,ttgload.c) /* glyph loader */ -#include FT_SOURCE_FILE(truetype,ttobjs.c) /* object manager */ +#include "ttdriver.c" /* driver interface */ +#include "ttpload.c" /* tables loader */ +#include "ttgload.c" /* glyph loader */ +#include "ttobjs.c" /* object manager */ #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER -#include FT_SOURCE_FILE(truetype,ttinterp.c) +#include "ttinterp.c" #endif diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c index 44782325c..9f23e368e 100644 --- a/src/truetype/ttdriver.c +++ b/src/truetype/ttdriver.c @@ -21,8 +21,8 @@ #include FT_INTERNAL_STREAM_H #include FT_INTERNAL_SFNT_H #include FT_TRUETYPE_NAMES_H -#include FT_SOURCE_FILE(truetype,ttdriver.h) -#include FT_SOURCE_FILE(truetype,ttgload.h) +#include "ttdriver.h" +#include "ttgload.h" /*************************************************************************/ diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c index 1464a8a9c..66aa38010 100644 --- a/src/truetype/ttgload.c +++ b/src/truetype/ttgload.c @@ -24,7 +24,7 @@ #include FT_TRUETYPE_TAGS_H #include FT_OUTLINE_H -#include FT_SOURCE_FILE(truetype,ttgload.h) +#include "ttgload.h" /*************************************************************************/ diff --git a/src/truetype/ttgload.h b/src/truetype/ttgload.h index 3bd41b676..1b45f51aa 100644 --- a/src/truetype/ttgload.h +++ b/src/truetype/ttgload.h @@ -21,10 +21,10 @@ #include -#include FT_SOURCE_FILE(truetype,ttobjs.h) +#include "ttobjs.h" #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER -#include FT_SOURCE_FILE(truetype,ttinterp.h) +#include "ttinterp.h" #endif diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c index d73cf9470..320c78338 100644 --- a/src/truetype/ttinterp.c +++ b/src/truetype/ttinterp.c @@ -20,7 +20,7 @@ #include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_CALC_H #include FT_SYSTEM_H -#include FT_SOURCE_FILE(truetype,ttinterp.h) +#include "ttinterp.h" #include FT_INTERNAL_TRUETYPE_ERRORS_H diff --git a/src/truetype/ttinterp.h b/src/truetype/ttinterp.h index b6f861c3a..c8a71f999 100644 --- a/src/truetype/ttinterp.h +++ b/src/truetype/ttinterp.h @@ -21,7 +21,7 @@ #include -#include FT_SOURCE_FILE(truetype,ttobjs.h) +#include "ttobjs.h" FT_BEGIN_HEADER diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c index d65524dc1..e2df8d433 100644 --- a/src/truetype/ttobjs.c +++ b/src/truetype/ttobjs.c @@ -26,11 +26,11 @@ #include FT_INTERNAL_POSTSCRIPT_NAMES_H #include FT_INTERNAL_TRUETYPE_ERRORS_H -#include FT_SOURCE_FILE(truetype,ttgload.h) -#include FT_SOURCE_FILE(truetype,ttpload.h) +#include "ttgload.h" +#include "ttpload.h" #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER -#include FT_SOURCE_FILE(truetype,ttinterp.h) +#include "ttinterp.h" #endif diff --git a/src/truetype/ttpload.c b/src/truetype/ttpload.c index a14ad1f31..aecd3c266 100644 --- a/src/truetype/ttpload.c +++ b/src/truetype/ttpload.c @@ -21,7 +21,7 @@ #include FT_INTERNAL_OBJECTS_H #include FT_INTERNAL_STREAM_H #include FT_TRUETYPE_TAGS_H -#include FT_SOURCE_FILE(truetype,ttpload.h) +#include "ttpload.h" #include FT_INTERNAL_TRUETYPE_ERRORS_H diff --git a/src/type1/descrip.mms b/src/type1/descrip.mms index 8d36c156d..da50ab158 100644 --- a/src/type1/descrip.mms +++ b/src/type1/descrip.mms @@ -13,7 +13,7 @@ # fully. -CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include] +CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.type1]) OBJS=type1.obj diff --git a/src/type1/rules.mk b/src/type1/rules.mk index c00b5941c..aff446f9a 100644 --- a/src/type1/rules.mk +++ b/src/type1/rules.mk @@ -21,7 +21,7 @@ T1_DIR_ := $(T1_DIR)$(SEP) # compilation flags for the driver # -T1_COMPILE := $(FT_COMPILE) +T1_COMPILE := $(FT_COMPILE) $I$(T1_DIR) # Type1 driver sources (i.e., C files) diff --git a/src/type1/t1afm.c b/src/type1/t1afm.c index 5f0457d5c..53c6a4b0f 100644 --- a/src/type1/t1afm.c +++ b/src/type1/t1afm.c @@ -17,7 +17,7 @@ #include -#include FT_SOURCE_FILE(type1,t1afm.h) +#include "t1afm.h" #include FT_INTERNAL_STREAM_H #include FT_INTERNAL_TYPE1_TYPES_H #include /* for qsort() */ diff --git a/src/type1/t1afm.h b/src/type1/t1afm.h index 8426b10e9..e2d5e3fd6 100644 --- a/src/type1/t1afm.h +++ b/src/type1/t1afm.h @@ -20,7 +20,7 @@ #define __T1AFM_H__ #include -#include FT_SOURCE_FILE(type1,t1objs.h) +#include "t1objs.h" FT_BEGIN_HEADER diff --git a/src/type1/t1driver.c b/src/type1/t1driver.c index b3a6c6c09..5146192f2 100644 --- a/src/type1/t1driver.c +++ b/src/type1/t1driver.c @@ -17,12 +17,12 @@ #include -#include FT_SOURCE_FILE(type1,t1driver.h) -#include FT_SOURCE_FILE(type1,t1gload.h) -#include FT_SOURCE_FILE(type1,t1load.h) +#include "t1driver.h" +#include "t1gload.h" +#include "t1load.h" #ifndef T1_CONFIG_OPTION_NO_AFM -#include FT_SOURCE_FILE(type1,t1afm.h) +#include "t1afm.h" #endif #include FT_INTERNAL_DEBUG_H diff --git a/src/type1/t1gload.c b/src/type1/t1gload.c index 7bb651630..071c29db8 100644 --- a/src/type1/t1gload.c +++ b/src/type1/t1gload.c @@ -17,7 +17,7 @@ #include -#include FT_SOURCE_FILE(type1,t1gload.h) +#include "t1gload.h" #include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_STREAM_H #include FT_OUTLINE_H diff --git a/src/type1/t1gload.h b/src/type1/t1gload.h index 0c48eaf83..99ca3a225 100644 --- a/src/type1/t1gload.h +++ b/src/type1/t1gload.h @@ -21,7 +21,7 @@ #include -#include FT_SOURCE_FILE(type1,t1objs.h) +#include "t1objs.h" FT_BEGIN_HEADER diff --git a/src/type1/t1load.c b/src/type1/t1load.c index bac08b111..39922262c 100644 --- a/src/type1/t1load.c +++ b/src/type1/t1load.c @@ -68,7 +68,7 @@ #include FT_INTERNAL_TYPE1_TYPES_H #include FT_INTERNAL_TYPE1_ERRORS_H -#include FT_SOURCE_FILE(type1,t1load.h) +#include "t1load.h" #include /* for strncmp(), strcmp() */ #include /* for isalnum() */ @@ -1383,7 +1383,7 @@ const T1_Field t1_keywords[] = { -#include FT_SOURCE_FILE(type1,t1tokens.h) +#include "t1tokens.h" /* now add the special functions... */ T1_FIELD_CALLBACK( "FontName", parse_font_name ) diff --git a/src/type1/t1load.h b/src/type1/t1load.h index 40100d2a3..fb117f035 100644 --- a/src/type1/t1load.h +++ b/src/type1/t1load.h @@ -25,7 +25,7 @@ #include FT_INTERNAL_POSTSCRIPT_AUX_H #include FT_MULTIPLE_MASTERS_H -#include FT_SOURCE_FILE(type1,t1parse.h) +#include "t1parse.h" FT_BEGIN_HEADER diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c index 84fea4955..bb8d69fd9 100644 --- a/src/type1/t1objs.c +++ b/src/type1/t1objs.c @@ -22,11 +22,11 @@ #include /* strcmp() */ -#include FT_SOURCE_FILE(type1,t1gload.h) -#include FT_SOURCE_FILE(type1,t1load.h) +#include "t1gload.h" +#include "t1load.h" #ifndef T1_CONFIG_OPTION_NO_AFM -#include FT_SOURCE_FILE(type1,t1afm.h) +#include "t1afm.h" #endif #include FT_INTERNAL_POSTSCRIPT_NAMES_H diff --git a/src/type1/t1parse.c b/src/type1/t1parse.c index 4d9a76706..eede8bb09 100644 --- a/src/type1/t1parse.c +++ b/src/type1/t1parse.c @@ -39,7 +39,7 @@ #include FT_INTERNAL_STREAM_H #include FT_INTERNAL_TYPE1_ERRORS_H #include FT_INTERNAL_POSTSCRIPT_AUX_H -#include FT_SOURCE_FILE(type1,t1parse.h) +#include "t1parse.h" #include /* for strncmp() */ diff --git a/src/type1/type1.c b/src/type1/type1.c index 03080f704..365126510 100644 --- a/src/type1/type1.c +++ b/src/type1/type1.c @@ -19,14 +19,14 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT #include -#include FT_SOURCE_FILE(type1,t1parse.c) -#include FT_SOURCE_FILE(type1,t1load.c) -#include FT_SOURCE_FILE(type1,t1objs.c) -#include FT_SOURCE_FILE(type1,t1driver.c) -#include FT_SOURCE_FILE(type1,t1gload.c) +#include "t1parse.c" +#include "t1load.c" +#include "t1objs.c" +#include "t1driver.c" +#include "t1gload.c" #ifndef T1_CONFIG_OPTION_NO_AFM -#include FT_SOURCE_FILE(type1,t1afm.c) +#include "t1afm.c" #endif diff --git a/src/winfonts/descrip.mms b/src/winfonts/descrip.mms index bfc878fc1..1f431e410 100644 --- a/src/winfonts/descrip.mms +++ b/src/winfonts/descrip.mms @@ -13,7 +13,7 @@ # fully. -CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include] +CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.winfonts]) OBJS=winfnt.obj diff --git a/src/winfonts/rules.mk b/src/winfonts/rules.mk index 8396894d9..aa015f4c8 100644 --- a/src/winfonts/rules.mk +++ b/src/winfonts/rules.mk @@ -19,7 +19,7 @@ FNT_DIR := $(SRC_)winfonts FNT_DIR_ := $(FNT_DIR)$(SEP) -FNT_COMPILE := $(FT_COMPILE) +FNT_COMPILE := $(FT_COMPILE) $I$(FNT_DIR) # Windows driver sources (i.e., C files) diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c index 10974869c..d83496096 100644 --- a/src/winfonts/winfnt.c +++ b/src/winfonts/winfnt.c @@ -22,7 +22,7 @@ #include FT_INTERNAL_STREAM_H #include FT_INTERNAL_OBJECTS_H #include FT_INTERNAL_FNT_TYPES_H -#include FT_SOURCE_FILE(winfonts,winfnt.h) +#include "winfnt.h" /*************************************************************************/