Another adjustment to header locations.
This change is a result of a discussion thread on freetype-devel http://lists.nongnu.org/archive/html/freetype-devel/2015-06/msg00041.html Re-introduce the `freetype2' subdirectory for all FreeType header files after installation, and rename the `freetype2' subdirectory in the git repository to `freetype'. * include/freetype2: Renamed to... * include/freetype: This. * CMakeLists.txt (PUBLIC_HEADERS, PUBLIC_CONFIG_HEADERS, PRIVATE_HEADERS): Updated. Update creation of `ftconfig.h'. Install generated `ftconfig.h'. * 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/freetype2.in: Updated. * builds/unix/freetype-config.in: Updated. * builds/unix/configure.raw: Don't check for `rmdir'. * builds/unix/unix-def.in (DELDIR): Use `rm -rf', which is portable according to the autoconf info manual. * builds/unix/install.mk (install, uninstall, distclean_project_unix): Update and simplify. * 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.
This commit is contained in:
Werner Lemberg
parent
41bfbadcd3
commit
392cf22f8a
@ -11,42 +11,48 @@
|
||||
# indicate that you have read the license and understand and accept it
|
||||
# fully.
|
||||
#
|
||||
# As a preliminary, create a compilation directory and change into it, for
|
||||
# example
|
||||
#
|
||||
# Say
|
||||
# mkdir ~/freetype2.compiled
|
||||
# cd ~/freetype2.compiled
|
||||
#
|
||||
# cmake CMakeLists.txt
|
||||
# Now you can say
|
||||
#
|
||||
# cmake <path-to-freetype2-src-dir>
|
||||
#
|
||||
# to create a Makefile that builds a static version of the library.
|
||||
#
|
||||
# For a dynamic library, use
|
||||
#
|
||||
# cmake CMakeLists.txt -DBUILD_SHARED_LIBS:BOOL=true
|
||||
# cmake <path-to-freetype2-src-dir> -DBUILD_SHARED_LIBS:BOOL=true
|
||||
#
|
||||
# For a framework on OS X, use
|
||||
#
|
||||
# cmake CMakeLists.txt -DBUILD_FRAMEWORK:BOOL=true -G Xcode
|
||||
# cmake <path-to-freetype2-src-dir> -DBUILD_FRAMEWORK:BOOL=true -G Xcode
|
||||
#
|
||||
# instead.
|
||||
#
|
||||
# For an iOS static library, use
|
||||
#
|
||||
# cmake CMakeLists.txt -DIOS_PLATFORM=OS -G Xcode
|
||||
# cmake <path-to-freetype2-src-dir> -DIOS_PLATFORM=OS -G Xcode
|
||||
#
|
||||
# or
|
||||
#
|
||||
# cmake CMakeLists.txt -DIOS_PLATFORM=SIMULATOR -G Xcode
|
||||
# cmake <path-to-freetype2-src-dir> -DIOS_PLATFORM=SIMULATOR -G Xcode
|
||||
#
|
||||
# Please refer to the cmake manual for further options, in particular, how
|
||||
# to modify compilation and linking parameters.
|
||||
#
|
||||
# Some notes.
|
||||
#
|
||||
# . `cmake' will overwrite FreeType's original (top-level) `Makefile' file.
|
||||
# . `cmake' will overwrite some files in the source tree in case you don't
|
||||
# call it from a build directory as described above.
|
||||
#
|
||||
# . You can use `cmake' directly on a freshly cloned FreeType git
|
||||
# repository.
|
||||
#
|
||||
# . `CMakeLists.txt' is provided as-is since it is not used by the
|
||||
# . `CMakeLists.txt' is provided as-is since it is not used by the
|
||||
# developer team.
|
||||
|
||||
|
||||
@ -109,21 +115,21 @@ add_definitions(-DFT2_BUILD_LIBRARY)
|
||||
include_directories("${PROJECT_SOURCE_DIR}/include")
|
||||
|
||||
# Create the configuration file
|
||||
message(STATUS "Creating directory, ${PROJECT_BINARY_DIR}/include/freetype2.")
|
||||
file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/include/freetype2)
|
||||
message(STATUS "Creating directory, ${PROJECT_BINARY_DIR}/include/freetype/config.")
|
||||
file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/include/freetype/config)
|
||||
|
||||
# For the auto-generated ftconfig.h file
|
||||
include_directories(BEFORE "${PROJECT_BINARY_DIR}/include/freetype2")
|
||||
message(STATUS "Creating ${PROJECT_BINARY_DIR}/include/freetype2/ftconfig.h.")
|
||||
include_directories(BEFORE "${PROJECT_BINARY_DIR}/include/freetype/config")
|
||||
message(STATUS "Creating ${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h.")
|
||||
execute_process(
|
||||
COMMAND sed -e "s/FT_CONFIG_OPTIONS_H/<ftoption.h>/" -e "s/FT_CONFIG_STANDARD_LIBRARY_H/<ftstdlib.h>/" -e "s?/undef ?#undef ?"
|
||||
INPUT_FILE ${PROJECT_SOURCE_DIR}/builds/unix/ftconfig.in
|
||||
OUTPUT_FILE ${PROJECT_BINARY_DIR}/include/freetype2/ftconfig.h
|
||||
OUTPUT_FILE ${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h
|
||||
)
|
||||
|
||||
file(GLOB PUBLIC_HEADERS "include/freetype2/*.h")
|
||||
file(GLOB PUBLIC_CONFIG_HEADERS "include/freetype2/config/*.h")
|
||||
file(GLOB PRIVATE_HEADERS "include/freetype2/internal/*.h")
|
||||
file(GLOB PUBLIC_HEADERS "include/ft2build.h" "include/freetype/*.h")
|
||||
file(GLOB PUBLIC_CONFIG_HEADERS "include/freetype/config/*.h")
|
||||
file(GLOB PRIVATE_HEADERS "include/freetype/internal/*.h")
|
||||
|
||||
set(BASE_SRCS
|
||||
src/autofit/autofit.c
|
||||
@ -219,6 +225,10 @@ endif ()
|
||||
install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/
|
||||
DESTINATION include/freetype2
|
||||
PATTERN "internal" EXCLUDE
|
||||
PATTERN "ftconfig.h" EXCLUDE
|
||||
)
|
||||
install(FILES ${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h
|
||||
DESTINATION include/freetype2/freetype/config
|
||||
)
|
||||
install(TARGETS freetype
|
||||
RUNTIME DESTINATION bin
|
||||
|
||||
46
ChangeLog
46
ChangeLog
@ -6,6 +6,52 @@
|
||||
|
||||
* src/bdf/bdflib.c (_bdf_parse_start): Simplify bpp parsing.
|
||||
|
||||
2015-06-25 Werner Lemberg <wl@gnu.org>
|
||||
|
||||
Another adjustment to header locations.
|
||||
|
||||
This change is a result of a discussion thread on freetype-devel
|
||||
|
||||
http://lists.nongnu.org/archive/html/freetype-devel/2015-06/msg00041.html
|
||||
|
||||
Re-introduce the `freetype2' subdirectory for all FreeType header
|
||||
files after installation, and rename the `freetype2' subdirectory in
|
||||
the git repository to `freetype'.
|
||||
|
||||
* include/freetype2: Renamed to...
|
||||
* include/freetype: This.
|
||||
|
||||
* CMakeLists.txt (PUBLIC_HEADERS, PUBLIC_CONFIG_HEADERS,
|
||||
PRIVATE_HEADERS): Updated.
|
||||
Update creation of `ftconfig.h'.
|
||||
Install generated `ftconfig.h'.
|
||||
|
||||
* 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/freetype2.in: Updated.
|
||||
|
||||
* builds/unix/freetype-config.in: Updated.
|
||||
* builds/unix/configure.raw: Don't check for `rmdir'.
|
||||
* builds/unix/unix-def.in (DELDIR): Use `rm -rf', which is portable
|
||||
according to the autoconf info manual.
|
||||
* builds/unix/install.mk (install, uninstall,
|
||||
distclean_project_unix): Update and simplify.
|
||||
|
||||
* 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.
|
||||
|
||||
2015-06-23 Werner Lemberg <wl@gnu.org>
|
||||
|
||||
s/TYPEOF/FT_TYPEOF/ (#45376).
|
||||
|
||||
10
Jamfile
10
Jamfile
@ -143,9 +143,9 @@ CCFLAGS += -DFT2_BUILD_LIBRARY ;
|
||||
# macros that are later used in #include statements. They need to be parsed
|
||||
# in order to record these definitions.
|
||||
#
|
||||
HDRMACRO [ FT2_SubDir $(FT2_INCLUDE_DIR) freetype2 config ftheader.h ] ;
|
||||
HDRMACRO [ FT2_SubDir $(FT2_INCLUDE_DIR) freetype2 internal internal.h ] ;
|
||||
HDRMACRO [ FT2_SubDir $(FT2_INCLUDE_DIR) freetype2 internal ftserv.h ] ;
|
||||
HDRMACRO [ FT2_SubDir $(FT2_INCLUDE_DIR) freetype config ftheader.h ] ;
|
||||
HDRMACRO [ FT2_SubDir $(FT2_INCLUDE_DIR) freetype internal internal.h ] ;
|
||||
HDRMACRO [ FT2_SubDir $(FT2_INCLUDE_DIR) freetype internal ftserv.h ] ;
|
||||
|
||||
|
||||
# Now include the Jamfile in `freetype2/src', used to drive the compilation
|
||||
@ -199,8 +199,8 @@ actions RefDoc
|
||||
--prefix=ft2
|
||||
--title=FreeType-2.6
|
||||
--output=$(DOC_DIR)
|
||||
$(FT2_INCLUDE)/freetype2/*.h
|
||||
$(FT2_INCLUDE)/freetype2/config/*.h
|
||||
$(FT2_INCLUDE)/freetype/*.h
|
||||
$(FT2_INCLUDE)/freetype/config/*.h
|
||||
}
|
||||
|
||||
RefDoc refdoc ;
|
||||
|
||||
@ -139,7 +139,7 @@ check_tool_version $LIBTOOLIZE libtoolize LIBTOOLIZE 2.2.4
|
||||
check_tool_version $AUTOCONF autoconf AUTOCONF 2.62
|
||||
|
||||
# This sets freetype_major, freetype_minor, and freetype_patch.
|
||||
eval `sed -nf version.sed include/freetype2/freetype.h`
|
||||
eval `sed -nf version.sed include/freetype/freetype.h`
|
||||
|
||||
# We set freetype-patch to an empty value if it is zero.
|
||||
if test "$freetype_patch" = ".0"; then
|
||||
|
||||
@ -51,7 +51,7 @@ directory. The results are:
|
||||
|
||||
- ftdebug.o, an object module containing the standard version of the
|
||||
debugging code which uses vprintf() and exit() (not pure).
|
||||
Debugging can be turned on in FT:include/freetype2/config/ftoption.h
|
||||
Debugging can be turned on in FT:include/freetype/config/ftoption.h
|
||||
and with FT_SetTraceLevel().
|
||||
|
||||
- ftdebugpure.o, an object module containing the pure version of the
|
||||
@ -65,13 +65,13 @@ directory. The results are:
|
||||
program, I decided to use a different scheme: You must #include
|
||||
FT:src/base/ftinit.c in your sourcecode and specify with #define
|
||||
statements which modules you need. See
|
||||
include/freetype2/config/ftmodule.h.
|
||||
include/freetype/config/ftmodule.h.
|
||||
|
||||
|
||||
To use in your own programs:
|
||||
|
||||
- Insert the #define and #include statements from top of
|
||||
include/freetype2/config/ftmodule.h in your source code and
|
||||
include/freetype/config/ftmodule.h in your source code and
|
||||
uncomment the #define statements for the FreeType2 modules you need.
|
||||
|
||||
- You can use either PARAMETERS=REGISTER or PARAMETERS=STACK for
|
||||
@ -101,7 +101,7 @@ To adapt to other compilers:
|
||||
useful for the src directory).
|
||||
|
||||
- An example of how to replace/workaround a problematic include file
|
||||
is include/freetype2/config/ftconfig.h; it changes a #define that
|
||||
is include/freetype/config/ftconfig.h; it changes a #define that
|
||||
would prevent SAS/C from generating XDEF's where it should do that and
|
||||
then includes the standard FreeType2 include file.
|
||||
|
||||
|
||||
@ -34,9 +34,9 @@
|
||||
/* Now include the original file */
|
||||
#ifndef __MORPHOS__
|
||||
#ifdef __SASC
|
||||
#include "FT:include/freetype2/config/ftconfig.h"
|
||||
#include "FT:include/freetype/config/ftconfig.h"
|
||||
#else
|
||||
#include "/FT/include/freetype2/config/ftconfig.h"
|
||||
#include "/FT/include/freetype/config/ftconfig.h"
|
||||
#endif
|
||||
#else
|
||||
/* We must define that, it seems that
|
||||
@ -45,7 +45,7 @@
|
||||
* binaries from http://www.morphos.de)
|
||||
*/
|
||||
#define _LIBC_LIMITS_H_
|
||||
#include "/FT/include/freetype2/config/ftconfig.h"
|
||||
#include "/FT/include/freetype/config/ftconfig.h"
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
||||
@ -43,7 +43,7 @@
|
||||
#
|
||||
# link your programs with libft2_ppc.a and either ftsystem.ppc.o or ftsystempure.ppc.o
|
||||
# (and either ftdebug.ppc.o or ftdebugpure.ppc.o if you enabled FT_DEBUG_LEVEL_ERROR or
|
||||
# FT_DEBUG_LEVEL_TRACE in include/freetype2/config/ftoption.h).
|
||||
# FT_DEBUG_LEVEL_TRACE in include/freetype/config/ftoption.h).
|
||||
|
||||
all: libft2_ppc.a ftsystem.ppc.o ftsystempure.ppc.o
|
||||
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
#
|
||||
# link your programs with libft2_ppc.a and either ftsystem.ppc.o or ftsystempure.ppc.o
|
||||
# (and either ftdebug.ppc.o or ftdebugpure.ppc.o if you enabled FT_DEBUG_LEVEL_ERROR or
|
||||
# FT_DEBUG_LEVEL_TRACE in include/freetype2/config/ftoption.h).
|
||||
# FT_DEBUG_LEVEL_TRACE in include/freetype/config/ftoption.h).
|
||||
|
||||
all: assign libft2_ppc.a ftsystem.ppc.o ftsystempure.ppc.o
|
||||
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
#
|
||||
# link your programs with ft2_680x0.lib and either ftsystem.o or ftsystempure.o
|
||||
# (and either ftdebug.o or ftdebugpure.o if you enabled FT_DEBUG_LEVEL_ERROR or
|
||||
# FT_DEBUG_LEVEL_TRACE in include/freetype2/config/ftoption.h).
|
||||
# FT_DEBUG_LEVEL_TRACE in include/freetype/config/ftoption.h).
|
||||
|
||||
OBJBASE = ftbase.o ftbbox.o ftbdf.o ftbitmap.o ftcid.o ftfntfmt.o ftfstype.o \
|
||||
ftgasp.o ftglyph.o ftgxval.o ftlcdfil.o ftmm.o ftotval.o \
|
||||
|
||||
@ -176,8 +176,8 @@
|
||||
/* the memory and stream components which are set to 7 and 5, */
|
||||
/* respectively. */
|
||||
/* */
|
||||
/* See the file <include/freetype2/internal/fttrace.h> for details of */
|
||||
/* the available toggle names. */
|
||||
/* See the file `include/freetype/internal/fttrace.h' for details of the */
|
||||
/* available toggle names. */
|
||||
/* */
|
||||
/* The level must be between 0 and 7; 0 means quiet (except for serious */
|
||||
/* runtime errors), and 7 means _very_ verbose. */
|
||||
|
||||
@ -97,7 +97,7 @@ BASE_DIR := $(SRC_DIR)/base
|
||||
|
||||
# Other derived directories.
|
||||
#
|
||||
PUBLIC_DIR := $(TOP_DIR)/include/freetype2
|
||||
PUBLIC_DIR := $(TOP_DIR)/include/freetype
|
||||
INTERNAL_DIR := $(PUBLIC_DIR)/internal
|
||||
SERVICES_DIR := $(INTERNAL_DIR)/services
|
||||
CONFIG_DIR := $(PUBLIC_DIR)/config
|
||||
@ -175,7 +175,7 @@ OBJECTS_LIST :=
|
||||
|
||||
|
||||
# Define $(PUBLIC_H) as the list of all public header files located in
|
||||
# `$(TOP_DIR)/include/freetype2'. $(INTERNAL_H), and $(CONFIG_H) are defined
|
||||
# `$(TOP_DIR)/include/freetype'. $(INTERNAL_H), and $(CONFIG_H) are defined
|
||||
# similarly.
|
||||
#
|
||||
# This is used to simplify the dependency rules -- if one of these files
|
||||
|
||||
@ -18,49 +18,49 @@ PRJ_MMPFILES
|
||||
freetype.mmp
|
||||
|
||||
PRJ_EXPORTS
|
||||
../../include/freetype2/ft2build.h
|
||||
../../include/freetype2/config/ftconfig.h config/ftconfig.h
|
||||
../../include/freetype2/config/ftheader.h config/ftheader.h
|
||||
../../include/freetype2/config/ftmodule.h config/ftmodule.h
|
||||
../../include/freetype2/config/ftoption.h config/ftoption.h
|
||||
../../include/freetype2/config/ftstdlib.h config/ftstdlib.h
|
||||
../../include/freetype2/freetype.h freetype.h
|
||||
../../include/freetype2/ftbbox.h ftbbox.h
|
||||
../../include/freetype2/ftbdf.h ftbdf.h
|
||||
../../include/freetype2/ftbitmap.h ftbitmap.h
|
||||
../../include/freetype2/ftcache.h ftcache.h
|
||||
../../include/freetype2/ftcid.h ftcid.h
|
||||
../../include/freetype2/fterrdef.h fterrdef.h
|
||||
../../include/freetype2/fterrors.h fterrors.h
|
||||
../../include/freetype2/ftfntfmt.h ftfntfmt.h
|
||||
../../include/freetype2/ftgasp.h ftgasp.h
|
||||
../../include/freetype2/ftglyph.h ftglyph.h
|
||||
../../include/freetype2/ftgxval.h ftgxval.h
|
||||
../../include/freetype2/ftgzip.h ftgzip.h
|
||||
../../include/freetype2/ftbzip2.h ftbzip2.h
|
||||
../../include/freetype2/ftimage.h ftimage.h
|
||||
../../include/freetype2/ftincrem.h ftincrem.h
|
||||
../../include/freetype2/ftlcdfil.h ftlcdfil.h
|
||||
../../include/freetype2/ftlist.h ftlist.h
|
||||
../../include/freetype2/ftlzw.h ftlzw.h
|
||||
../../include/freetype2/ftmac.h ftmac.h
|
||||
../../include/freetype2/ftmm.h ftmm.h
|
||||
../../include/freetype2/ftmodapi.h ftmodapi.h
|
||||
../../include/freetype2/ftmoderr.h ftmoderr.h
|
||||
../../include/freetype2/ftotval.h ftotval.h
|
||||
../../include/freetype2/ftoutln.h ftoutln.h
|
||||
../../include/freetype2/ftpfr.h ftpfr.h
|
||||
../../include/freetype2/ftrender.h ftrender.h
|
||||
../../include/freetype2/ftsizes.h ftsizes.h
|
||||
../../include/freetype2/ftsnames.h ftsnames.h
|
||||
../../include/freetype2/ftstroke.h ftstroke.h
|
||||
../../include/freetype2/ftsynth.h ftsynth.h
|
||||
../../include/freetype2/ftsystem.h ftsystem.h
|
||||
../../include/freetype2/fttrigon.h fttrigon.h
|
||||
../../include/freetype2/fttypes.h fttypes.h
|
||||
../../include/freetype2/ftwinfnt.h ftwinfnt.h
|
||||
../../include/freetype2/t1tables.h t1tables.h
|
||||
../../include/freetype2/ttnameid.h ttnameid.h
|
||||
../../include/freetype2/tttables.h tttables.h
|
||||
../../include/freetype2/tttags.h tttags.h
|
||||
../../include/freetype2/ttunpat.h ttunpat.h
|
||||
../../include/freetype/ft2build.h
|
||||
../../include/freetype/config/ftconfig.h config/ftconfig.h
|
||||
../../include/freetype/config/ftheader.h config/ftheader.h
|
||||
../../include/freetype/config/ftmodule.h config/ftmodule.h
|
||||
../../include/freetype/config/ftoption.h config/ftoption.h
|
||||
../../include/freetype/config/ftstdlib.h config/ftstdlib.h
|
||||
../../include/freetype/freetype.h freetype.h
|
||||
../../include/freetype/ftbbox.h ftbbox.h
|
||||
../../include/freetype/ftbdf.h ftbdf.h
|
||||
../../include/freetype/ftbitmap.h ftbitmap.h
|
||||
../../include/freetype/ftcache.h ftcache.h
|
||||
../../include/freetype/ftcid.h ftcid.h
|
||||
../../include/freetype/fterrdef.h fterrdef.h
|
||||
../../include/freetype/fterrors.h fterrors.h
|
||||
../../include/freetype/ftfntfmt.h ftfntfmt.h
|
||||
../../include/freetype/ftgasp.h ftgasp.h
|
||||
../../include/freetype/ftglyph.h ftglyph.h
|
||||
../../include/freetype/ftgxval.h ftgxval.h
|
||||
../../include/freetype/ftgzip.h ftgzip.h
|
||||
../../include/freetype/ftbzip2.h ftbzip2.h
|
||||
../../include/freetype/ftimage.h ftimage.h
|
||||
../../include/freetype/ftincrem.h ftincrem.h
|
||||
../../include/freetype/ftlcdfil.h ftlcdfil.h
|
||||
../../include/freetype/ftlist.h ftlist.h
|
||||
../../include/freetype/ftlzw.h ftlzw.h
|
||||
../../include/freetype/ftmac.h ftmac.h
|
||||
../../include/freetype/ftmm.h ftmm.h
|
||||
../../include/freetype/ftmodapi.h ftmodapi.h
|
||||
../../include/freetype/ftmoderr.h ftmoderr.h
|
||||
../../include/freetype/ftotval.h ftotval.h
|
||||
../../include/freetype/ftoutln.h ftoutln.h
|
||||
../../include/freetype/ftpfr.h ftpfr.h
|
||||
../../include/freetype/ftrender.h ftrender.h
|
||||
../../include/freetype/ftsizes.h ftsizes.h
|
||||
../../include/freetype/ftsnames.h ftsnames.h
|
||||
../../include/freetype/ftstroke.h ftstroke.h
|
||||
../../include/freetype/ftsynth.h ftsynth.h
|
||||
../../include/freetype/ftsystem.h ftsystem.h
|
||||
../../include/freetype/fttrigon.h fttrigon.h
|
||||
../../include/freetype/fttypes.h fttypes.h
|
||||
../../include/freetype/ftwinfnt.h ftwinfnt.h
|
||||
../../include/freetype/t1tables.h t1tables.h
|
||||
../../include/freetype/ttnameid.h ttnameid.h
|
||||
../../include/freetype/tttables.h tttables.h
|
||||
../../include/freetype/tttags.h tttags.h
|
||||
../../include/freetype/ttunpat.h ttunpat.h
|
||||
|
||||
@ -172,7 +172,7 @@ include $(TOP_DIR)/builds/modules.mk
|
||||
# get FreeType version string, using a
|
||||
# poor man's `sed' emulation with make's built-in string functions
|
||||
#
|
||||
work := $(strip $(shell $(CAT) $(TOP_DIR)/include/freetype2/freetype.h))
|
||||
work := $(strip $(shell $(CAT) $(TOP_DIR)/include/freetype/freetype.h))
|
||||
work := $(subst |,x,$(work))
|
||||
work := $(subst $(space),|,$(work))
|
||||
work := $(subst \#define|FREETYPE_MAJOR|,$(space),$(work))
|
||||
|
||||
@ -70,11 +70,6 @@ AC_SUBST(CC_BUILD)
|
||||
AC_SUBST(EXEEXT_BUILD)
|
||||
|
||||
|
||||
# auxiliary programs
|
||||
|
||||
AC_CHECK_PROG([RMDIR], [rmdir], [rmdir])
|
||||
|
||||
|
||||
# Since this file will be finally moved to another directory we make
|
||||
# the path of the install script absolute. This small code snippet has
|
||||
# been taken from automake's `ylwrap' script.
|
||||
|
||||
@ -124,22 +124,20 @@ else
|
||||
fi
|
||||
|
||||
if test "$echo_ft_version" = "yes" ; then
|
||||
major=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
|
||||
major=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
|
||||
| grep FREETYPE_MAJOR \
|
||||
| sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
|
||||
minor=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
|
||||
minor=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
|
||||
| grep FREETYPE_MINOR \
|
||||
| sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
|
||||
patch=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
|
||||
patch=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
|
||||
| grep FREETYPE_PATCH \
|
||||
| sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
|
||||
echo $major.$minor.$patch
|
||||
fi
|
||||
|
||||
if test "$echo_cflags" = "yes" ; then
|
||||
if test "${SYSROOT}$includedir" != "/usr/include"; then
|
||||
echo -I${SYSROOT}$includedir
|
||||
fi
|
||||
echo -I${SYSROOT}$includedir/freetype2
|
||||
fi
|
||||
|
||||
if test "$echo_libs" = "yes" ; then
|
||||
|
||||
@ -11,4 +11,4 @@ Requires:
|
||||
Requires.private: %REQUIRES_PRIVATE%
|
||||
Libs: -L${libdir} -lfreetype
|
||||
Libs.private: %LIBS_PRIVATE%
|
||||
Cflags: -I${includedir}
|
||||
Cflags: -I${includedir}/freetype2
|
||||
|
||||
@ -86,7 +86,7 @@ FT_BEGIN_HEADER
|
||||
#else /* !FT_USE_AUTOCONF_SIZEOF_TYPES */
|
||||
|
||||
/* Following cpp computation of the bit length of int and long */
|
||||
/* is copied from default include/freetype2/config/ftconfig.h. */
|
||||
/* is copied from default include/freetype/config/ftconfig.h. */
|
||||
/* If any improvement is required for this file, it should be */
|
||||
/* applied to the original header file for the builders that */
|
||||
/* do not use configure script. */
|
||||
|
||||
@ -24,38 +24,34 @@
|
||||
|
||||
# Unix installation and deinstallation targets.
|
||||
#
|
||||
# Note that we remove any data in the `freetype' subdirectory found in
|
||||
# `$(includedir)/freetype2', which was the previous location of the header
|
||||
# files up to version 2.5.0.
|
||||
# Note that we remove any data found in `$(includedir)/freetype2' before
|
||||
# installing new files to avoid interferences with files installed by
|
||||
# previous FreeType versions (which use slightly different locations).
|
||||
#
|
||||
install: $(PROJECT_LIBRARY)
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
|
||||
$(DESTDIR)$(libdir)/pkgconfig \
|
||||
$(DESTDIR)$(includedir)/freetype2/config \
|
||||
$(DESTDIR)$(bindir) \
|
||||
$(DESTDIR)$(datadir)/aclocal \
|
||||
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
|
||||
$(DESTDIR)$(libdir)/pkgconfig \
|
||||
$(DESTDIR)$(includedir)/freetype2/freetype/config \
|
||||
$(DESTDIR)$(bindir) \
|
||||
$(DESTDIR)$(datadir)/aclocal \
|
||||
$(DESTDIR)$(mandir)/man1
|
||||
$(LIBTOOL) --mode=install $(INSTALL) \
|
||||
$(PROJECT_LIBRARY) $(DESTDIR)$(libdir)
|
||||
-for P in $(PUBLIC_H) ; do \
|
||||
$(INSTALL_DATA) \
|
||||
$$P $(DESTDIR)$(includedir)/freetype2 ; \
|
||||
-for P in $(PUBLIC_H) ; do \
|
||||
$(INSTALL_DATA) \
|
||||
$$P $(DESTDIR)$(includedir)/freetype2/freetype ; \
|
||||
done
|
||||
-for P in $(CONFIG_H) ; do \
|
||||
$(INSTALL_DATA) \
|
||||
$$P $(DESTDIR)$(includedir)/freetype2/config ; \
|
||||
-for P in $(CONFIG_H) ; do \
|
||||
$(INSTALL_DATA) \
|
||||
$$P $(DESTDIR)$(includedir)/freetype2/freetype/config ; \
|
||||
done
|
||||
$(INSTALL_DATA) $(TOP_DIR)/include/ft2build.h \
|
||||
$(DESTDIR)$(includedir)/ft2build.h
|
||||
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/config/*
|
||||
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/config
|
||||
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/*
|
||||
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype
|
||||
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/ft2build.h
|
||||
$(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h \
|
||||
$(DESTDIR)$(includedir)/freetype2/config/ftconfig.h
|
||||
$(INSTALL_DATA) $(OBJ_DIR)/ftmodule.h \
|
||||
$(DESTDIR)$(includedir)/freetype2/config/ftmodule.h
|
||||
$(INSTALL_DATA) $(TOP_DIR)/include/ft2build.h \
|
||||
$(DESTDIR)$(includedir)/freetype2/ft2build.h
|
||||
$(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h \
|
||||
$(DESTDIR)$(includedir)/freetype2/freetype/config/ftconfig.h
|
||||
$(INSTALL_DATA) $(OBJ_DIR)/ftmodule.h \
|
||||
$(DESTDIR)$(includedir)/freetype2/freetype/config/ftmodule.h
|
||||
$(INSTALL_SCRIPT) -m 755 $(OBJ_BUILD)/freetype-config \
|
||||
$(DESTDIR)$(bindir)/freetype-config
|
||||
$(INSTALL_SCRIPT) -m 644 $(BUILD_DIR)/freetype2.m4 \
|
||||
@ -68,11 +64,7 @@ install: $(PROJECT_LIBRARY)
|
||||
|
||||
uninstall:
|
||||
-$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(LIBRARY).$A
|
||||
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/config/*
|
||||
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/config
|
||||
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/*
|
||||
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2
|
||||
-$(DELETE) $(DESTDIR)$(includedir)/ft2build.h
|
||||
-$(DELETE) $(DESTDIR)$(bindir)/freetype-config
|
||||
-$(DELETE) $(DESTDIR)$(datadir)/aclocal/freetype2.m4
|
||||
-$(DELETE) $(DESTDIR)$(libdir)/pkgconfig/freetype2.pc
|
||||
@ -94,7 +86,6 @@ clean_project_unix:
|
||||
|
||||
distclean_project_unix: clean_project_unix
|
||||
-$(DELETE) $(PROJECT_LIBRARY)
|
||||
-$(DELETE) $(OBJ_DIR)/.libs/*
|
||||
-$(DELDIR) $(OBJ_DIR)/.libs
|
||||
-$(DELETE) *.orig *~ core *.core $(DISTCLEAN)
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ SHELL := @SHELL@
|
||||
TOP_DIR := $(shell cd $(TOP_DIR); pwd)
|
||||
|
||||
DELETE := rm -f
|
||||
DELDIR := @RMDIR@
|
||||
DELDIR := rm -rf
|
||||
CAT := cat
|
||||
SEP := /
|
||||
|
||||
|
||||
@ -148,8 +148,8 @@
|
||||
/* for the memory and stream components which are set to 6 and 5, */
|
||||
/* respectively. */
|
||||
/* */
|
||||
/* See the file <internal/fttrace.h> for details of the available toggle */
|
||||
/* names. */
|
||||
/* See the file `include/freetype/internal/fttrace.h' for details of the */
|
||||
/* available toggle names. */
|
||||
/* */
|
||||
/* The level must be between 0 and 6; 0 means quiet (except for serious */
|
||||
/* runtime errors), and 6 means _very_ verbose. */
|
||||
|
||||
@ -3822,15 +3822,15 @@
|
||||
<Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl">
|
||||
<File RelativePath="..\..\..\include\ft2build.h">
|
||||
</File>
|
||||
<File RelativePath="..\..\..\include\freetype2\config\ftconfig.h">
|
||||
<File RelativePath="..\..\..\include\freetype\config\ftconfig.h">
|
||||
</File>
|
||||
<File RelativePath="..\..\..\include\freetype2\config\ftheader.h">
|
||||
<File RelativePath="..\..\..\include\freetype\config\ftheader.h">
|
||||
</File>
|
||||
<File RelativePath="..\..\..\include\freetype2\config\ftmodule.h">
|
||||
<File RelativePath="..\..\..\include\freetype\config\ftmodule.h">
|
||||
</File>
|
||||
<File RelativePath="..\..\..\include\freetype2\config\ftoption.h">
|
||||
<File RelativePath="..\..\..\include\freetype\config\ftoption.h">
|
||||
</File>
|
||||
<File RelativePath="..\..\..\include\freetype2\config\ftstdlib.h">
|
||||
<File RelativePath="..\..\..\include\freetype\config\ftstdlib.h">
|
||||
</File>
|
||||
</Filter>
|
||||
</Files>
|
||||
|
||||
@ -13469,23 +13469,23 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\include\freetype2\config\ftconfig.h"
|
||||
RelativePath="..\..\..\include\freetype\config\ftconfig.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\include\freetype2\config\ftheader.h"
|
||||
RelativePath="..\..\..\include\freetype\config\ftheader.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\include\freetype2\config\ftmodule.h"
|
||||
RelativePath="..\..\..\include\freetype\config\ftmodule.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\include\freetype2\config\ftoption.h"
|
||||
RelativePath="..\..\..\include\freetype\config\ftoption.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\include\freetype2\config\ftstdlib.h"
|
||||
RelativePath="..\..\..\include\freetype\config\ftstdlib.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
|
||||
@ -137,8 +137,8 @@
|
||||
/* for the memory and stream components which are set to 6 and 5, */
|
||||
/* respectively. */
|
||||
/* */
|
||||
/* See the file <internal/fttrace.h> for details of the available toggle */
|
||||
/* names. */
|
||||
/* See the file `include/freetype/internal/fttrace.h' for details of the */
|
||||
/* available toggle names. */
|
||||
/* */
|
||||
/* The level must be between 0 and 6; 0 means quiet (except for serious */
|
||||
/* runtime errors), and 6 means _very_ verbose. */
|
||||
|
||||
@ -629,15 +629,15 @@
|
||||
<Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl">
|
||||
<File RelativePath="..\..\..\include\ft2build.h">
|
||||
</File>
|
||||
<File RelativePath="..\..\..\include\freetype2\config\ftconfig.h">
|
||||
<File RelativePath="..\..\..\include\freetype\config\ftconfig.h">
|
||||
</File>
|
||||
<File RelativePath="..\..\..\include\freetype2\config\ftheader.h">
|
||||
<File RelativePath="..\..\..\include\freetype\config\ftheader.h">
|
||||
</File>
|
||||
<File RelativePath="..\..\..\include\freetype2\config\ftmodule.h">
|
||||
<File RelativePath="..\..\..\include\freetype\config\ftmodule.h">
|
||||
</File>
|
||||
<File RelativePath="..\..\..\include\freetype2\config\ftoption.h">
|
||||
<File RelativePath="..\..\..\include\freetype\config\ftoption.h">
|
||||
</File>
|
||||
<File RelativePath="..\..\..\include\freetype2\config\ftstdlib.h">
|
||||
<File RelativePath="..\..\..\include\freetype\config\ftstdlib.h">
|
||||
</File>
|
||||
</Filter>
|
||||
</Files>
|
||||
|
||||
@ -2154,23 +2154,23 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\include\freetype2\config\ftconfig.h"
|
||||
RelativePath="..\..\..\include\freetype\config\ftconfig.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\include\freetype2\config\ftheader.h"
|
||||
RelativePath="..\..\..\include\freetype\config\ftheader.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\include\freetype2\config\ftmodule.h"
|
||||
RelativePath="..\..\..\include\freetype\config\ftmodule.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\include\freetype2\config\ftoption.h"
|
||||
RelativePath="..\..\..\include\freetype\config\ftoption.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\include\freetype2\config\ftstdlib.h"
|
||||
RelativePath="..\..\..\include\freetype\config\ftstdlib.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
|
||||
@ -1706,11 +1706,11 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\..\include\ft2build.h" />
|
||||
<ClInclude Include="..\..\..\include\freetype2\config\ftconfig.h" />
|
||||
<ClInclude Include="..\..\..\include\freetype2\config\ftheader.h" />
|
||||
<ClInclude Include="..\..\..\include\freetype2\config\ftmodule.h" />
|
||||
<ClInclude Include="..\..\..\include\freetype2\config\ftoption.h" />
|
||||
<ClInclude Include="..\..\..\include\freetype2\config\ftstdlib.h" />
|
||||
<ClInclude Include="..\..\..\include\freetype\config\ftconfig.h" />
|
||||
<ClInclude Include="..\..\..\include\freetype\config\ftheader.h" />
|
||||
<ClInclude Include="..\..\..\include\freetype\config\ftmodule.h" />
|
||||
<ClInclude Include="..\..\..\include\freetype\config\ftoption.h" />
|
||||
<ClInclude Include="..\..\..\include\freetype\config\ftstdlib.h" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
|
||||
@ -136,19 +136,19 @@
|
||||
<ClInclude Include="..\..\..\include\ft2build.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\include\freetype2\config\ftconfig.h">
|
||||
<ClInclude Include="..\..\..\include\freetype\config\ftconfig.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\include\freetype2\config\ftheader.h">
|
||||
<ClInclude Include="..\..\..\include\freetype\config\ftheader.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\include\freetype2\config\ftmodule.h">
|
||||
<ClInclude Include="..\..\..\include\freetype\config\ftmodule.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\include\freetype2\config\ftoption.h">
|
||||
<ClInclude Include="..\..\..\include\freetype\config\ftoption.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\include\freetype2\config\ftstdlib.h">
|
||||
<ClInclude Include="..\..\..\include\freetype\config\ftstdlib.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
|
||||
@ -377,23 +377,23 @@ SOURCE=..\..\..\include\ft2build.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\include\freetype2\config\ftconfig.h
|
||||
SOURCE=..\..\..\include\freetype\config\ftconfig.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\include\freetype2\config\ftheader.h
|
||||
SOURCE=..\..\..\include\freetype\config\ftheader.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\include\freetype2\config\ftmodule.h
|
||||
SOURCE=..\..\..\include\freetype\config\ftmodule.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\include\freetype2\config\ftoption.h
|
||||
SOURCE=..\..\..\include\freetype\config\ftoption.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\include\freetype2\config\ftstdlib.h
|
||||
SOURCE=..\..\..\include\freetype\config\ftstdlib.h
|
||||
# End Source File
|
||||
# End Group
|
||||
# End Target
|
||||
|
||||
@ -2153,23 +2153,23 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\include\freetype2\config\ftconfig.h"
|
||||
RelativePath="..\..\..\include\freetype\config\ftconfig.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\include\freetype2\config\ftheader.h"
|
||||
RelativePath="..\..\..\include\freetype\config\ftheader.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\include\freetype2\config\ftmodule.h"
|
||||
RelativePath="..\..\..\include\freetype\config\ftmodule.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\include\freetype2\config\ftoption.h"
|
||||
RelativePath="..\..\..\include\freetype\config\ftoption.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\include\freetype2\config\ftstdlib.h"
|
||||
RelativePath="..\..\..\include\freetype\config\ftstdlib.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
|
||||
@ -377,23 +377,23 @@ SOURCE=..\..\..\include\ft2build.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\include\freetype2\config\ftconfig.h
|
||||
SOURCE=..\..\..\include\freetype\config\ftconfig.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\include\freetype2\config\ftheader.h
|
||||
SOURCE=..\..\..\include\freetype\config\ftheader.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\include\freetype2\config\ftmodule.h
|
||||
SOURCE=..\..\..\include\freetype\config\ftmodule.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\include\freetype2\config\ftoption.h
|
||||
SOURCE=..\..\..\include\freetype\config\ftoption.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\include\freetype2\config\ftstdlib.h
|
||||
SOURCE=..\..\..\include\freetype\config\ftstdlib.h
|
||||
# End Source File
|
||||
# End Group
|
||||
# End Target
|
||||
|
||||
@ -13859,23 +13859,23 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\include\freetype2\config\ftconfig.h"
|
||||
RelativePath="..\..\..\include\freetype\config\ftconfig.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\include\freetype2\config\ftheader.h"
|
||||
RelativePath="..\..\..\include\freetype\config\ftheader.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\include\freetype2\config\ftmodule.h"
|
||||
RelativePath="..\..\..\include\freetype\config\ftmodule.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\include\freetype2\config\ftoption.h"
|
||||
RelativePath="..\..\..\include\freetype\config\ftoption.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\include\freetype2\config\ftstdlib.h"
|
||||
RelativePath="..\..\..\include\freetype\config\ftstdlib.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
|
||||
#define FT_CONFIG_OPTIONS_H <ftoption.h>
|
||||
|
||||
#include <freetype2/config/ftheader.h>
|
||||
#include <freetype/config/ftheader.h>
|
||||
|
||||
#endif /* __FT2BUILD_H__ */
|
||||
|
||||
|
||||
@ -38,7 +38,7 @@ FT_BEGIN_HEADER
|
||||
/* library from a single source directory. */
|
||||
/* */
|
||||
/* - You can put a copy of this file in your build directory, more */
|
||||
/* precisely in `$BUILD/freetype2/config/ftoption.h', where `$BUILD' */
|
||||
/* precisely in `$BUILD/freetype/config/ftoption.h', where `$BUILD' */
|
||||
/* is the name of a directory that is included _before_ the FreeType */
|
||||
/* include path during compilation. */
|
||||
/* */
|
||||
@ -51,7 +51,7 @@ FT_BEGIN_HEADER
|
||||
/* locate this file during the build. For example, */
|
||||
/* */
|
||||
/* #define FT_CONFIG_OPTIONS_H <myftoptions.h> */
|
||||
/* #include <freetype2/config/ftheader.h> */
|
||||
/* #include <freetype/config/ftheader.h> */
|
||||
/* */
|
||||
/* will use `$BUILD/myftoptions.h' instead of this file for macro */
|
||||
/* definitions. */
|
||||
@ -59,7 +59,7 @@ FT_BEGIN_HEADER
|
||||
/* Note also that you can similarly pre-define the macro */
|
||||
/* FT_CONFIG_MODULES_H used to locate the file listing of the modules */
|
||||
/* that are statically linked to the library at compile time. By */
|
||||
/* default, this file is <freetype2/config/ftmodule.h>. */
|
||||
/* default, this file is <freetype/config/ftmodule.h>. */
|
||||
/* */
|
||||
/* We highly recommend using the third method whenever possible. */
|
||||
/* */
|
||||
|
||||
@ -2,11 +2,8 @@ CHANGES BETWEEN 2.6 and 2.6.1
|
||||
|
||||
I. IMPORTANT CHANGES
|
||||
|
||||
- The header file layout has been slightly changed (again). After
|
||||
installation, the file `ft2build.h' is now located in
|
||||
`<prefix>/include'. Additionally, the header directory include
|
||||
path has changed from `<prefix>/include/freetype2' to simply
|
||||
`<prefix>/include'.
|
||||
- The header file layout has been changed (again), moving all
|
||||
header files except `ft2build.h' into a subdirectory tree.
|
||||
|
||||
Doing so reduces the possibility of header file name clashes
|
||||
(e.g., FTGL's `FTGlyph.h' with FreeType's `ftglyph.h' on case
|
||||
|
||||
@ -8,7 +8,7 @@ How to customize the compilation of the library
|
||||
|
||||
I. Configuration macros
|
||||
|
||||
The file `include/freetype2/config/ftoption.h' contains a list of
|
||||
The file `include/freetype/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,7 +35,7 @@ II. Modules list
|
||||
can keep the source files `clean'.
|
||||
|
||||
If you don't use GNU make you have to manually edit the file
|
||||
`include/freetype2/config/ftmodule.h' (which is *not* used with if
|
||||
`include/freetype/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.
|
||||
@ -96,8 +96,8 @@ IV. Overriding default configuration and module headers
|
||||
#include FT_CONFIG_MODULES_H
|
||||
|
||||
are compiled. Their default values being
|
||||
<freetype2/config/ftoption.h> and <freetype2/config/ftmodule.h>,
|
||||
you can do something like:
|
||||
<freetype/config/ftoption.h> and <freetype/config/ftmodule.h>, you
|
||||
can do something like:
|
||||
|
||||
custom/
|
||||
config/
|
||||
@ -123,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 <freetype2/config/ftheader.h>
|
||||
#include <freetype/config/ftheader.h>
|
||||
|
||||
#endif /* __FT2_BUILD_MY_PLATFORM_H__ */
|
||||
|
||||
|
||||
@ -103,7 +103,7 @@ I. Standard procedure
|
||||
`type1cid.c' needs `psaux.c', `pshinter.c', and `psnames.c'
|
||||
`type42.c' needs `truetype.c'
|
||||
|
||||
Please consult the central `include/freetype2/config/ftoption.h'
|
||||
Please consult the central `include/freetype/config/ftoption.h'
|
||||
configuration file for details on additional libraries necessary
|
||||
for some optional features.
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
How to prepare a new release
|
||||
----------------------------
|
||||
|
||||
. include/freetype2/freetype.h: Update FREETYPE_MAJOR, FREETYPE_MINOR,
|
||||
. include/freetype/freetype.h: Update FREETYPE_MAJOR, FREETYPE_MINOR,
|
||||
and FREETYPE_PATCH.
|
||||
|
||||
. Update version numbers in all files where necessary (for example, do
|
||||
|
||||
@ -107,7 +107,7 @@
|
||||
*
|
||||
*/
|
||||
#ifndef FT_CONFIG_CONFIG_H
|
||||
#define FT_CONFIG_CONFIG_H <freetype2/config/ftconfig.h>
|
||||
#define FT_CONFIG_CONFIG_H <freetype/config/ftconfig.h>
|
||||
#endif
|
||||
|
||||
|
||||
@ -122,7 +122,7 @@
|
||||
*
|
||||
*/
|
||||
#ifndef FT_CONFIG_STANDARD_LIBRARY_H
|
||||
#define FT_CONFIG_STANDARD_LIBRARY_H <freetype2/config/ftstdlib.h>
|
||||
#define FT_CONFIG_STANDARD_LIBRARY_H <freetype/config/ftstdlib.h>
|
||||
#endif
|
||||
|
||||
|
||||
@ -137,7 +137,7 @@
|
||||
*
|
||||
*/
|
||||
#ifndef FT_CONFIG_OPTIONS_H
|
||||
#define FT_CONFIG_OPTIONS_H <freetype2/config/ftoption.h>
|
||||
#define FT_CONFIG_OPTIONS_H <freetype/config/ftoption.h>
|
||||
#endif
|
||||
|
||||
|
||||
@ -153,7 +153,7 @@
|
||||
*
|
||||
*/
|
||||
#ifndef FT_CONFIG_MODULES_H
|
||||
#define FT_CONFIG_MODULES_H <freetype2/config/ftmodule.h>
|
||||
#define FT_CONFIG_MODULES_H <freetype/config/ftmodule.h>
|
||||
#endif
|
||||
|
||||
/* */
|
||||
@ -170,7 +170,7 @@
|
||||
* base FreeType~2 API.
|
||||
*
|
||||
*/
|
||||
#define FT_FREETYPE_H <freetype2/freetype.h>
|
||||
#define FT_FREETYPE_H <freetype/freetype.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -185,7 +185,7 @@
|
||||
* It is included by @FT_FREETYPE_H.
|
||||
*
|
||||
*/
|
||||
#define FT_ERRORS_H <freetype2/fterrors.h>
|
||||
#define FT_ERRORS_H <freetype/fterrors.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -198,7 +198,7 @@
|
||||
* list of FreeType~2 module error offsets (and messages).
|
||||
*
|
||||
*/
|
||||
#define FT_MODULE_ERRORS_H <freetype2/ftmoderr.h>
|
||||
#define FT_MODULE_ERRORS_H <freetype/ftmoderr.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -214,7 +214,7 @@
|
||||
* It is included by @FT_FREETYPE_H.
|
||||
*
|
||||
*/
|
||||
#define FT_SYSTEM_H <freetype2/ftsystem.h>
|
||||
#define FT_SYSTEM_H <freetype/ftsystem.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -230,7 +230,7 @@
|
||||
* It is included by @FT_FREETYPE_H.
|
||||
*
|
||||
*/
|
||||
#define FT_IMAGE_H <freetype2/ftimage.h>
|
||||
#define FT_IMAGE_H <freetype/ftimage.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -245,7 +245,7 @@
|
||||
* It is included by @FT_FREETYPE_H.
|
||||
*
|
||||
*/
|
||||
#define FT_TYPES_H <freetype2/fttypes.h>
|
||||
#define FT_TYPES_H <freetype/fttypes.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -260,7 +260,7 @@
|
||||
* (Most applications will never need to include this file.)
|
||||
*
|
||||
*/
|
||||
#define FT_LIST_H <freetype2/ftlist.h>
|
||||
#define FT_LIST_H <freetype/ftlist.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -273,7 +273,7 @@
|
||||
* scalable outline management API of FreeType~2.
|
||||
*
|
||||
*/
|
||||
#define FT_OUTLINE_H <freetype2/ftoutln.h>
|
||||
#define FT_OUTLINE_H <freetype/ftoutln.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -286,7 +286,7 @@
|
||||
* API which manages multiple @FT_Size objects per face.
|
||||
*
|
||||
*/
|
||||
#define FT_SIZES_H <freetype2/ftsizes.h>
|
||||
#define FT_SIZES_H <freetype/ftsizes.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -299,7 +299,7 @@
|
||||
* module management API of FreeType~2.
|
||||
*
|
||||
*/
|
||||
#define FT_MODULE_H <freetype2/ftmodapi.h>
|
||||
#define FT_MODULE_H <freetype/ftmodapi.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -312,7 +312,7 @@
|
||||
* renderer module management API of FreeType~2.
|
||||
*
|
||||
*/
|
||||
#define FT_RENDER_H <freetype2/ftrender.h>
|
||||
#define FT_RENDER_H <freetype/ftrender.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -325,7 +325,7 @@
|
||||
* structures and macros related to the auto-hinting module.
|
||||
*
|
||||
*/
|
||||
#define FT_AUTOHINTER_H <freetype2/ftautoh.h>
|
||||
#define FT_AUTOHINTER_H <freetype/ftautoh.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -338,7 +338,7 @@
|
||||
* structures and macros related to the CFF driver module.
|
||||
*
|
||||
*/
|
||||
#define FT_CFF_DRIVER_H <freetype2/ftcffdrv.h>
|
||||
#define FT_CFF_DRIVER_H <freetype/ftcffdrv.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -351,7 +351,7 @@
|
||||
* structures and macros related to the TrueType driver module.
|
||||
*
|
||||
*/
|
||||
#define FT_TRUETYPE_DRIVER_H <freetype2/ftttdrv.h>
|
||||
#define FT_TRUETYPE_DRIVER_H <freetype/ftttdrv.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -364,7 +364,7 @@
|
||||
* types and API specific to the Type~1 format.
|
||||
*
|
||||
*/
|
||||
#define FT_TYPE1_TABLES_H <freetype2/t1tables.h>
|
||||
#define FT_TYPE1_TABLES_H <freetype/t1tables.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -379,7 +379,7 @@
|
||||
* definitions, taken from the TrueType and OpenType specifications.
|
||||
*
|
||||
*/
|
||||
#define FT_TRUETYPE_IDS_H <freetype2/ttnameid.h>
|
||||
#define FT_TRUETYPE_IDS_H <freetype/ttnameid.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -392,7 +392,7 @@
|
||||
* types and API specific to the TrueType (as well as OpenType) format.
|
||||
*
|
||||
*/
|
||||
#define FT_TRUETYPE_TABLES_H <freetype2/tttables.h>
|
||||
#define FT_TRUETYPE_TABLES_H <freetype/tttables.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -406,7 +406,7 @@
|
||||
* SFNT-based font formats (i.e., TrueType and OpenType).
|
||||
*
|
||||
*/
|
||||
#define FT_TRUETYPE_TAGS_H <freetype2/tttags.h>
|
||||
#define FT_TRUETYPE_TAGS_H <freetype/tttags.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -420,7 +420,7 @@
|
||||
* face.
|
||||
*
|
||||
*/
|
||||
#define FT_BDF_H <freetype2/ftbdf.h>
|
||||
#define FT_BDF_H <freetype/ftbdf.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -434,7 +434,7 @@
|
||||
* face.
|
||||
*
|
||||
*/
|
||||
#define FT_CID_H <freetype2/ftcid.h>
|
||||
#define FT_CID_H <freetype/ftcid.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -447,7 +447,7 @@
|
||||
* definitions of an API which supports gzip-compressed files.
|
||||
*
|
||||
*/
|
||||
#define FT_GZIP_H <freetype2/ftgzip.h>
|
||||
#define FT_GZIP_H <freetype/ftgzip.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -460,7 +460,7 @@
|
||||
* definitions of an API which supports LZW-compressed files.
|
||||
*
|
||||
*/
|
||||
#define FT_LZW_H <freetype2/ftlzw.h>
|
||||
#define FT_LZW_H <freetype/ftlzw.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -473,7 +473,7 @@
|
||||
* definitions of an API which supports bzip2-compressed files.
|
||||
*
|
||||
*/
|
||||
#define FT_BZIP2_H <freetype2/ftbzip2.h>
|
||||
#define FT_BZIP2_H <freetype/ftbzip2.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -486,7 +486,7 @@
|
||||
* definitions of an API which supports Windows FNT files.
|
||||
*
|
||||
*/
|
||||
#define FT_WINFONTS_H <freetype2/ftwinfnt.h>
|
||||
#define FT_WINFONTS_H <freetype/ftwinfnt.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -499,7 +499,7 @@
|
||||
* API of the optional glyph management component.
|
||||
*
|
||||
*/
|
||||
#define FT_GLYPH_H <freetype2/ftglyph.h>
|
||||
#define FT_GLYPH_H <freetype/ftglyph.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -512,7 +512,7 @@
|
||||
* API of the optional bitmap conversion component.
|
||||
*
|
||||
*/
|
||||
#define FT_BITMAP_H <freetype2/ftbitmap.h>
|
||||
#define FT_BITMAP_H <freetype/ftbitmap.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -525,7 +525,7 @@
|
||||
* API of the optional exact bounding box computation routines.
|
||||
*
|
||||
*/
|
||||
#define FT_BBOX_H <freetype2/ftbbox.h>
|
||||
#define FT_BBOX_H <freetype/ftbbox.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -538,7 +538,7 @@
|
||||
* API of the optional FreeType~2 cache sub-system.
|
||||
*
|
||||
*/
|
||||
#define FT_CACHE_H <freetype2/ftcache.h>
|
||||
#define FT_CACHE_H <freetype/ftcache.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -612,7 +612,7 @@
|
||||
* compiled on the Mac (note that the base API still works though).
|
||||
*
|
||||
*/
|
||||
#define FT_MAC_H <freetype2/ftmac.h>
|
||||
#define FT_MAC_H <freetype/ftmac.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -625,7 +625,7 @@
|
||||
* optional multiple-masters management API of FreeType~2.
|
||||
*
|
||||
*/
|
||||
#define FT_MULTIPLE_MASTERS_H <freetype2/ftmm.h>
|
||||
#define FT_MULTIPLE_MASTERS_H <freetype/ftmm.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -639,7 +639,7 @@
|
||||
* SFNT-based font formats (i.e., TrueType and OpenType).
|
||||
*
|
||||
*/
|
||||
#define FT_SFNT_NAMES_H <freetype2/ftsnames.h>
|
||||
#define FT_SFNT_NAMES_H <freetype/ftsnames.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -653,7 +653,7 @@
|
||||
* GPOS, GSUB, JSTF).
|
||||
*
|
||||
*/
|
||||
#define FT_OPENTYPE_VALIDATE_H <freetype2/ftotval.h>
|
||||
#define FT_OPENTYPE_VALIDATE_H <freetype/ftotval.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -667,7 +667,7 @@
|
||||
* mort, morx, bsln, just, kern, opbd, trak, prop).
|
||||
*
|
||||
*/
|
||||
#define FT_GX_VALIDATE_H <freetype2/ftgxval.h>
|
||||
#define FT_GX_VALIDATE_H <freetype/ftgxval.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -680,7 +680,7 @@
|
||||
* FreeType~2 API which accesses PFR-specific data.
|
||||
*
|
||||
*/
|
||||
#define FT_PFR_H <freetype2/ftpfr.h>
|
||||
#define FT_PFR_H <freetype/ftpfr.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -692,7 +692,7 @@
|
||||
* A macro used in #include statements to name the file containing the
|
||||
* FreeType~2 API which provides functions to stroke outline paths.
|
||||
*/
|
||||
#define FT_STROKER_H <freetype2/ftstroke.h>
|
||||
#define FT_STROKER_H <freetype/ftstroke.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -704,7 +704,7 @@
|
||||
* A macro used in #include statements to name the file containing the
|
||||
* FreeType~2 API which performs artificial obliquing and emboldening.
|
||||
*/
|
||||
#define FT_SYNTHESIS_H <freetype2/ftsynth.h>
|
||||
#define FT_SYNTHESIS_H <freetype/ftsynth.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -716,7 +716,7 @@
|
||||
* A macro used in #include statements to name the file containing the
|
||||
* FreeType~2 API which provides functions specific to font formats.
|
||||
*/
|
||||
#define FT_FONT_FORMATS_H <freetype2/ftfntfmt.h>
|
||||
#define FT_FONT_FORMATS_H <freetype/ftfntfmt.h>
|
||||
|
||||
/* deprecated */
|
||||
#define FT_XFREE86_H FT_FONT_FORMATS_H
|
||||
@ -732,7 +732,7 @@
|
||||
* FreeType~2 API which performs trigonometric computations (e.g.,
|
||||
* cosines and arc tangents).
|
||||
*/
|
||||
#define FT_TRIGONOMETRY_H <freetype2/fttrigon.h>
|
||||
#define FT_TRIGONOMETRY_H <freetype/fttrigon.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -744,7 +744,7 @@
|
||||
* A macro used in #include statements to name the file containing the
|
||||
* FreeType~2 API which performs color filtering for subpixel rendering.
|
||||
*/
|
||||
#define FT_LCD_FILTER_H <freetype2/ftlcdfil.h>
|
||||
#define FT_LCD_FILTER_H <freetype/ftlcdfil.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -756,7 +756,7 @@
|
||||
* A macro used in #include statements to name the file containing the
|
||||
* FreeType~2 API which performs color filtering for subpixel rendering.
|
||||
*/
|
||||
#define FT_UNPATENTED_HINTING_H <freetype2/ttunpat.h>
|
||||
#define FT_UNPATENTED_HINTING_H <freetype/ttunpat.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -768,7 +768,7 @@
|
||||
* A macro used in #include statements to name the file containing the
|
||||
* FreeType~2 API which performs color filtering for subpixel rendering.
|
||||
*/
|
||||
#define FT_INCREMENTAL_H <freetype2/ftincrem.h>
|
||||
#define FT_INCREMENTAL_H <freetype/ftincrem.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -780,7 +780,7 @@
|
||||
* A macro used in #include statements to name the file containing the
|
||||
* FreeType~2 API which returns entries from the TrueType GASP table.
|
||||
*/
|
||||
#define FT_GASP_H <freetype2/ftgasp.h>
|
||||
#define FT_GASP_H <freetype/ftgasp.h>
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
@ -792,30 +792,30 @@
|
||||
* A macro used in #include statements to name the file containing the
|
||||
* FreeType~2 API which returns individual and ranged glyph advances.
|
||||
*/
|
||||
#define FT_ADVANCES_H <freetype2/ftadvanc.h>
|
||||
#define FT_ADVANCES_H <freetype/ftadvanc.h>
|
||||
|
||||
|
||||
/* */
|
||||
|
||||
#define FT_ERROR_DEFINITIONS_H <freetype2/fterrdef.h>
|
||||
#define FT_ERROR_DEFINITIONS_H <freetype/fterrdef.h>
|
||||
|
||||
|
||||
/* The internals of the cache sub-system are no longer exposed. We */
|
||||
/* default to FT_CACHE_H at the moment just in case, but we know of */
|
||||
/* no rogue client that uses them. */
|
||||
/* */
|
||||
#define FT_CACHE_MANAGER_H <freetype2/ftcache.h>
|
||||
#define FT_CACHE_INTERNAL_MRU_H <freetype2/ftcache.h>
|
||||
#define FT_CACHE_INTERNAL_MANAGER_H <freetype2/ftcache.h>
|
||||
#define FT_CACHE_INTERNAL_CACHE_H <freetype2/ftcache.h>
|
||||
#define FT_CACHE_INTERNAL_GLYPH_H <freetype2/ftcache.h>
|
||||
#define FT_CACHE_INTERNAL_IMAGE_H <freetype2/ftcache.h>
|
||||
#define FT_CACHE_INTERNAL_SBITS_H <freetype2/ftcache.h>
|
||||
#define FT_CACHE_MANAGER_H <freetype/ftcache.h>
|
||||
#define FT_CACHE_INTERNAL_MRU_H <freetype/ftcache.h>
|
||||
#define FT_CACHE_INTERNAL_MANAGER_H <freetype/ftcache.h>
|
||||
#define FT_CACHE_INTERNAL_CACHE_H <freetype/ftcache.h>
|
||||
#define FT_CACHE_INTERNAL_GLYPH_H <freetype/ftcache.h>
|
||||
#define FT_CACHE_INTERNAL_IMAGE_H <freetype/ftcache.h>
|
||||
#define FT_CACHE_INTERNAL_SBITS_H <freetype/ftcache.h>
|
||||
|
||||
|
||||
#define FT_INCREMENTAL_H <freetype2/ftincrem.h>
|
||||
#define FT_INCREMENTAL_H <freetype/ftincrem.h>
|
||||
|
||||
#define FT_TRUETYPE_UNPATENTED_H <freetype2/ttunpat.h>
|
||||
#define FT_TRUETYPE_UNPATENTED_H <freetype/ttunpat.h>
|
||||
|
||||
|
||||
/*
|
||||
@ -823,7 +823,7 @@
|
||||
* only when building the library.
|
||||
*/
|
||||
#ifdef FT2_BUILD_LIBRARY
|
||||
#define FT_INTERNAL_INTERNAL_H <freetype2/internal/internal.h>
|
||||
#define FT_INTERNAL_INTERNAL_H <freetype/internal/internal.h>
|
||||
#include FT_INTERNAL_INTERNAL_H
|
||||
#endif /* FT2_BUILD_LIBRARY */
|
||||
|
||||
@ -38,7 +38,7 @@ FT_BEGIN_HEADER
|
||||
/* library from a single source directory. */
|
||||
/* */
|
||||
/* - You can put a copy of this file in your build directory, more */
|
||||
/* precisely in `$BUILD/freetype2/config/ftoption.h', where `$BUILD' */
|
||||
/* precisely in `$BUILD/freetype/config/ftoption.h', where `$BUILD' */
|
||||
/* is the name of a directory that is included _before_ the FreeType */
|
||||
/* include path during compilation. */
|
||||
/* */
|
||||
@ -51,7 +51,7 @@ FT_BEGIN_HEADER
|
||||
/* locate this file during the build. For example, */
|
||||
/* */
|
||||
/* #define FT_CONFIG_OPTIONS_H <myftoptions.h> */
|
||||
/* #include <freetype2/config/ftheader.h> */
|
||||
/* #include <freetype/config/ftheader.h> */
|
||||
/* */
|
||||
/* will use `$BUILD/myftoptions.h' instead of this file for macro */
|
||||
/* definitions. */
|
||||
@ -59,7 +59,7 @@ FT_BEGIN_HEADER
|
||||
/* Note also that you can similarly pre-define the macro */
|
||||
/* FT_CONFIG_MODULES_H used to locate the file listing of the modules */
|
||||
/* that are statically linked to the library at compile time. By */
|
||||
/* default, this file is <freetype2/config/ftmodule.h>. */
|
||||
/* default, this file is <freetype/config/ftmodule.h>. */
|
||||
/* */
|
||||
/* We highly recommend using the third method whenever possible. */
|
||||
/* */
|
||||
@ -734,24 +734,24 @@ FT_BEGIN_HEADER
|
||||
* The header files containing the services.
|
||||
*/
|
||||
|
||||
#define FT_SERVICE_BDF_H <freetype2/internal/services/svbdf.h>
|
||||
#define FT_SERVICE_CID_H <freetype2/internal/services/svcid.h>
|
||||
#define FT_SERVICE_GLYPH_DICT_H <freetype2/internal/services/svgldict.h>
|
||||
#define FT_SERVICE_GX_VALIDATE_H <freetype2/internal/services/svgxval.h>
|
||||
#define FT_SERVICE_KERNING_H <freetype2/internal/services/svkern.h>
|
||||
#define FT_SERVICE_MULTIPLE_MASTERS_H <freetype2/internal/services/svmm.h>
|
||||
#define FT_SERVICE_OPENTYPE_VALIDATE_H <freetype2/internal/services/svotval.h>
|
||||
#define FT_SERVICE_PFR_H <freetype2/internal/services/svpfr.h>
|
||||
#define FT_SERVICE_POSTSCRIPT_CMAPS_H <freetype2/internal/services/svpscmap.h>
|
||||
#define FT_SERVICE_POSTSCRIPT_INFO_H <freetype2/internal/services/svpsinfo.h>
|
||||
#define FT_SERVICE_POSTSCRIPT_NAME_H <freetype2/internal/services/svpostnm.h>
|
||||
#define FT_SERVICE_PROPERTIES_H <freetype2/internal/services/svprop.h>
|
||||
#define FT_SERVICE_SFNT_H <freetype2/internal/services/svsfnt.h>
|
||||
#define FT_SERVICE_TRUETYPE_ENGINE_H <freetype2/internal/services/svtteng.h>
|
||||
#define FT_SERVICE_TT_CMAP_H <freetype2/internal/services/svttcmap.h>
|
||||
#define FT_SERVICE_WINFNT_H <freetype2/internal/services/svwinfnt.h>
|
||||
#define FT_SERVICE_FONT_FORMAT_H <freetype2/internal/services/svfntfmt.h>
|
||||
#define FT_SERVICE_TRUETYPE_GLYF_H <freetype2/internal/services/svttglyf.h>
|
||||
#define FT_SERVICE_BDF_H <freetype/internal/services/svbdf.h>
|
||||
#define FT_SERVICE_CID_H <freetype/internal/services/svcid.h>
|
||||
#define FT_SERVICE_GLYPH_DICT_H <freetype/internal/services/svgldict.h>
|
||||
#define FT_SERVICE_GX_VALIDATE_H <freetype/internal/services/svgxval.h>
|
||||
#define FT_SERVICE_KERNING_H <freetype/internal/services/svkern.h>
|
||||
#define FT_SERVICE_MULTIPLE_MASTERS_H <freetype/internal/services/svmm.h>
|
||||
#define FT_SERVICE_OPENTYPE_VALIDATE_H <freetype/internal/services/svotval.h>
|
||||
#define FT_SERVICE_PFR_H <freetype/internal/services/svpfr.h>
|
||||
#define FT_SERVICE_POSTSCRIPT_CMAPS_H <freetype/internal/services/svpscmap.h>
|
||||
#define FT_SERVICE_POSTSCRIPT_INFO_H <freetype/internal/services/svpsinfo.h>
|
||||
#define FT_SERVICE_POSTSCRIPT_NAME_H <freetype/internal/services/svpostnm.h>
|
||||
#define FT_SERVICE_PROPERTIES_H <freetype/internal/services/svprop.h>
|
||||
#define FT_SERVICE_SFNT_H <freetype/internal/services/svsfnt.h>
|
||||
#define FT_SERVICE_TRUETYPE_ENGINE_H <freetype/internal/services/svtteng.h>
|
||||
#define FT_SERVICE_TT_CMAP_H <freetype/internal/services/svttcmap.h>
|
||||
#define FT_SERVICE_WINFNT_H <freetype/internal/services/svwinfnt.h>
|
||||
#define FT_SERVICE_FONT_FORMAT_H <freetype/internal/services/svfntfmt.h>
|
||||
#define FT_SERVICE_TRUETYPE_GLYF_H <freetype/internal/services/svttglyf.h>
|
||||
|
||||
/* */
|
||||
|
||||
@ -24,28 +24,28 @@
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
#define FT_INTERNAL_OBJECTS_H <freetype2/internal/ftobjs.h>
|
||||
#define FT_INTERNAL_PIC_H <freetype2/internal/ftpic.h>
|
||||
#define FT_INTERNAL_STREAM_H <freetype2/internal/ftstream.h>
|
||||
#define FT_INTERNAL_MEMORY_H <freetype2/internal/ftmemory.h>
|
||||
#define FT_INTERNAL_DEBUG_H <freetype2/internal/ftdebug.h>
|
||||
#define FT_INTERNAL_CALC_H <freetype2/internal/ftcalc.h>
|
||||
#define FT_INTERNAL_DRIVER_H <freetype2/internal/ftdriver.h>
|
||||
#define FT_INTERNAL_TRACE_H <freetype2/internal/fttrace.h>
|
||||
#define FT_INTERNAL_GLYPH_LOADER_H <freetype2/internal/ftgloadr.h>
|
||||
#define FT_INTERNAL_SFNT_H <freetype2/internal/sfnt.h>
|
||||
#define FT_INTERNAL_SERVICE_H <freetype2/internal/ftserv.h>
|
||||
#define FT_INTERNAL_RFORK_H <freetype2/internal/ftrfork.h>
|
||||
#define FT_INTERNAL_VALIDATE_H <freetype2/internal/ftvalid.h>
|
||||
#define FT_INTERNAL_OBJECTS_H <freetype/internal/ftobjs.h>
|
||||
#define FT_INTERNAL_PIC_H <freetype/internal/ftpic.h>
|
||||
#define FT_INTERNAL_STREAM_H <freetype/internal/ftstream.h>
|
||||
#define FT_INTERNAL_MEMORY_H <freetype/internal/ftmemory.h>
|
||||
#define FT_INTERNAL_DEBUG_H <freetype/internal/ftdebug.h>
|
||||
#define FT_INTERNAL_CALC_H <freetype/internal/ftcalc.h>
|
||||
#define FT_INTERNAL_DRIVER_H <freetype/internal/ftdriver.h>
|
||||
#define FT_INTERNAL_TRACE_H <freetype/internal/fttrace.h>
|
||||
#define FT_INTERNAL_GLYPH_LOADER_H <freetype/internal/ftgloadr.h>
|
||||
#define FT_INTERNAL_SFNT_H <freetype/internal/sfnt.h>
|
||||
#define FT_INTERNAL_SERVICE_H <freetype/internal/ftserv.h>
|
||||
#define FT_INTERNAL_RFORK_H <freetype/internal/ftrfork.h>
|
||||
#define FT_INTERNAL_VALIDATE_H <freetype/internal/ftvalid.h>
|
||||
|
||||
#define FT_INTERNAL_TRUETYPE_TYPES_H <freetype2/internal/tttypes.h>
|
||||
#define FT_INTERNAL_TYPE1_TYPES_H <freetype2/internal/t1types.h>
|
||||
#define FT_INTERNAL_TRUETYPE_TYPES_H <freetype/internal/tttypes.h>
|
||||
#define FT_INTERNAL_TYPE1_TYPES_H <freetype/internal/t1types.h>
|
||||
|
||||
#define FT_INTERNAL_POSTSCRIPT_AUX_H <freetype2/internal/psaux.h>
|
||||
#define FT_INTERNAL_POSTSCRIPT_HINTS_H <freetype2/internal/pshints.h>
|
||||
#define FT_INTERNAL_POSTSCRIPT_GLOBALS_H <freetype2/internal/psglobal.h>
|
||||
#define FT_INTERNAL_POSTSCRIPT_AUX_H <freetype/internal/psaux.h>
|
||||
#define FT_INTERNAL_POSTSCRIPT_HINTS_H <freetype/internal/pshints.h>
|
||||
#define FT_INTERNAL_POSTSCRIPT_GLOBALS_H <freetype/internal/psglobal.h>
|
||||
|
||||
#define FT_INTERNAL_AUTOHINT_H <freetype2/internal/autohint.h>
|
||||
#define FT_INTERNAL_AUTOHINT_H <freetype/internal/autohint.h>
|
||||
|
||||
|
||||
#if defined( _MSC_VER ) /* Visual C++ (and Intel C++) */
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user