diff options
| author | Werner Lemberg <wl@gnu.org> | 2015-06-22 06:35:23 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2015-06-22 06:35:23 +0200 |
| commit | 8502c98b15390a397de2d5826c9d8b017d7fc208 (patch) | |
| tree | 90d3ab5eaa2a7337e6782a0c3795ad0d4aea90e7 /docs/CUSTOMIZE | |
| parent | 31d97df99fb8c7f52d19d675b8d497753f719594 (diff) | |
| download | freetype2-8502c98b15390a397de2d5826c9d8b017d7fc208.tar.gz | |
Fix Savannah bug #45097.
We no longer `pollute' the namespace of possible header file names;
instead we move `ft2build.h' up by one level so that it gets
installed in the default include directory (e.g.,
/usr/local/include). After this commit, only `ft2build.h' stays in
the compiler's include path.
No visible changes for the user who follows the standard FreeType
header inclusion rules.
* include/*: Move to ...
* include/freetype2/*: This directory, except `ft2build.h'.
* CMakeLists.txt (PUBLIC_HEADERS, PUBLIC_CONFIG_HEADERS,
PRIVATE_HEADERS), Jamfile (HDRMACRO, RefDoc), autogen.sh: Updated.
* builds/amiga/include/config/ftconfig.h, builds/freetype.mk
(PUBLIC_DIR), builds/symbian/bld.inf, builds/toplevel.mk (work),
builds/unix/install.mk (install, uninstall),
builds/unix/freetype2.in: Updated.
* builds/unix/freetype-config.in: Updated.
Emit -I directory only if it is not `/usr/include'.
* builds/wince/*, builds/windows/*: Updated.
* devel/ft2build.h, include/ft2build.h: Updated.
* include/freetype2/config/ftheader.h,
include/freetype2/internal/ftserv.h,
include/freetype2/internal/internal.h: Update all header file
macros.
* src/tools/chktrcmp.py (TRACE_DEF_FILES): Updated.
* docs/*: Updated.
Diffstat (limited to 'docs/CUSTOMIZE')
| -rw-r--r-- | docs/CUSTOMIZE | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/docs/CUSTOMIZE b/docs/CUSTOMIZE index 831edf679..612beb793 100644 --- a/docs/CUSTOMIZE +++ b/docs/CUSTOMIZE @@ -8,7 +8,7 @@ How to customize the compilation of the library I. Configuration macros - The file found in `include/config/ftoption.h' contains a list of + The file `include/freetype2/config/ftoption.h' contains a list of commented configuration macros that can be toggled by developers to indicate which features should be active while building the library. @@ -35,9 +35,9 @@ II. Modules list can keep the source files `clean'. If you don't use GNU make you have to manually edit the file - `include/config/ftmodule.h' (which is *not* used with if compiled - with GNU make) to add or remove the drivers and components you want - to compile into the library. See `INSTALL.ANY' for more + `include/freetype2/config/ftmodule.h' (which is *not* used with if + compiled with GNU make) to add or remove the drivers and components + you want to compile into the library. See `INSTALL.ANY' for more information. @@ -95,8 +95,9 @@ IV. Overriding default configuration and module headers #include FT_CONFIG_OPTIONS_H #include FT_CONFIG_MODULES_H - are compiled. Their default values being <config/ftoption.h> and - <config/ftmodule.h>, you can do something like: + are compiled. Their default values being + <freetype2/config/ftoption.h> and <freetype2/config/ftmodule.h>, + you can do something like: custom/ config/ @@ -122,7 +123,7 @@ IV. Overriding default configuration and module headers #define FT_CONFIG_OPTIONS_H <custom/my-ftoption.h> #define FT_CONFIG_MODULES_H <custom/my-ftmodule.h> - #include <config/ftheader.h> + #include <freetype2/config/ftheader.h> #endif /* __FT2_BUILD_MY_PLATFORM_H__ */ |