diff options
| -rw-r--r-- | CMakeLists.txt | 42 | ||||
| -rw-r--r-- | ChangeLog | 46 | ||||
| -rw-r--r-- | Jamfile | 10 | ||||
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | builds/amiga/README | 8 | ||||
| -rw-r--r-- | builds/amiga/include/config/ftconfig.h | 6 | ||||
| -rw-r--r-- | builds/amiga/makefile | 2 | ||||
| -rw-r--r-- | builds/amiga/makefile.os4 | 2 | ||||
| -rw-r--r-- | builds/amiga/smakefile | 2 | ||||
| -rw-r--r-- | builds/amiga/src/base/ftdebug.c | 4 | ||||
| -rw-r--r-- | builds/freetype.mk | 4 | ||||
| -rw-r--r-- | builds/symbian/bld.inf | 92 | ||||
| -rw-r--r-- | builds/toplevel.mk | 2 | ||||
| -rw-r--r-- | builds/unix/configure.raw | 5 | ||||
| -rw-r--r-- | builds/unix/freetype-config.in | 10 | ||||
| -rw-r--r-- | builds/unix/freetype2.in | 2 | ||||
| -rw-r--r-- | builds/unix/ftconfig.in | 2 | ||||
| -rw-r--r-- | builds/unix/install.mk | 51 | ||||
| -rw-r--r-- | builds/unix/unix-def.in | 2 | ||||
| -rw-r--r-- | builds/wince/ftdebug.c | 4 | ||||
| -rw-r--r-- | builds/wince/vc2005-ce/freetype.vcproj | 10 | ||||
| -rw-r--r-- | builds/wince/vc2008-ce/freetype.vcproj | 10 | ||||
| -rw-r--r-- | builds/windows/ftdebug.c | 4 | ||||
| -rw-r--r-- | builds/windows/vc2005/freetype.vcproj | 10 | ||||
| -rw-r--r-- | builds/windows/vc2008/freetype.vcproj | 10 | ||||
| -rw-r--r-- | builds/windows/vc2010/freetype.vcxproj | 10 | ||||
| -rw-r--r-- | builds/windows/vc2010/freetype.vcxproj.filters | 10 | ||||
| -rw-r--r-- | builds/windows/visualc/freetype.dsp | 10 | ||||
| -rw-r--r-- | builds/windows/visualc/freetype.vcproj | 10 | ||||
| -rw-r--r-- | builds/windows/visualce/freetype.dsp | 10 | ||||
| -rw-r--r-- | builds/windows/visualce/freetype.vcproj | 10 | ||||
| -rw-r--r-- | devel/ft2build.h | 2 | ||||
| -rw-r--r-- | devel/ftoption.h | 6 | ||||
| -rw-r--r-- | docs/CHANGES | 7 | ||||
| -rw-r--r-- | docs/CUSTOMIZE | 10 | ||||
| -rw-r--r-- | docs/INSTALL.ANY | 2 | ||||
| -rw-r--r-- | docs/release | 2 | ||||
| -rw-r--r-- | include/freetype/config/ftconfig.h (renamed from include/freetype2/config/ftconfig.h) | 0 | ||||
| -rw-r--r-- | include/freetype/config/ftheader.h (renamed from include/freetype2/config/ftheader.h) | 116 | ||||
| -rw-r--r-- | include/freetype/config/ftmodule.h (renamed from include/freetype2/config/ftmodule.h) | 0 | ||||
| -rw-r--r-- | include/freetype/config/ftoption.h (renamed from include/freetype2/config/ftoption.h) | 6 | ||||
| -rw-r--r-- | include/freetype/config/ftstdlib.h (renamed from include/freetype2/config/ftstdlib.h) | 0 | ||||
| -rw-r--r-- | include/freetype/freetype.h (renamed from include/freetype2/freetype.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftadvanc.h (renamed from include/freetype2/ftadvanc.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftautoh.h (renamed from include/freetype2/ftautoh.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftbbox.h (renamed from include/freetype2/ftbbox.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftbdf.h (renamed from include/freetype2/ftbdf.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftbitmap.h (renamed from include/freetype2/ftbitmap.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftbzip2.h (renamed from include/freetype2/ftbzip2.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftcache.h (renamed from include/freetype2/ftcache.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftcffdrv.h (renamed from include/freetype2/ftcffdrv.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftchapters.h (renamed from include/freetype2/ftchapters.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftcid.h (renamed from include/freetype2/ftcid.h) | 0 | ||||
| -rw-r--r-- | include/freetype/fterrdef.h (renamed from include/freetype2/fterrdef.h) | 0 | ||||
| -rw-r--r-- | include/freetype/fterrors.h (renamed from include/freetype2/fterrors.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftfntfmt.h (renamed from include/freetype2/ftfntfmt.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftgasp.h (renamed from include/freetype2/ftgasp.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftglyph.h (renamed from include/freetype2/ftglyph.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftgxval.h (renamed from include/freetype2/ftgxval.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftgzip.h (renamed from include/freetype2/ftgzip.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftimage.h (renamed from include/freetype2/ftimage.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftincrem.h (renamed from include/freetype2/ftincrem.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftlcdfil.h (renamed from include/freetype2/ftlcdfil.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftlist.h (renamed from include/freetype2/ftlist.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftlzw.h (renamed from include/freetype2/ftlzw.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftmac.h (renamed from include/freetype2/ftmac.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftmm.h (renamed from include/freetype2/ftmm.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftmodapi.h (renamed from include/freetype2/ftmodapi.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftmoderr.h (renamed from include/freetype2/ftmoderr.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftotval.h (renamed from include/freetype2/ftotval.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftoutln.h (renamed from include/freetype2/ftoutln.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftpfr.h (renamed from include/freetype2/ftpfr.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftrender.h (renamed from include/freetype2/ftrender.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftsizes.h (renamed from include/freetype2/ftsizes.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftsnames.h (renamed from include/freetype2/ftsnames.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftstroke.h (renamed from include/freetype2/ftstroke.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftsynth.h (renamed from include/freetype2/ftsynth.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftsystem.h (renamed from include/freetype2/ftsystem.h) | 0 | ||||
| -rw-r--r-- | include/freetype/fttrigon.h (renamed from include/freetype2/fttrigon.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftttdrv.h (renamed from include/freetype2/ftttdrv.h) | 0 | ||||
| -rw-r--r-- | include/freetype/fttypes.h (renamed from include/freetype2/fttypes.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ftwinfnt.h (renamed from include/freetype2/ftwinfnt.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/autohint.h (renamed from include/freetype2/internal/autohint.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/ftcalc.h (renamed from include/freetype2/internal/ftcalc.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/ftdebug.h (renamed from include/freetype2/internal/ftdebug.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/ftdriver.h (renamed from include/freetype2/internal/ftdriver.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/ftgloadr.h (renamed from include/freetype2/internal/ftgloadr.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/ftmemory.h (renamed from include/freetype2/internal/ftmemory.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/ftobjs.h (renamed from include/freetype2/internal/ftobjs.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/ftpic.h (renamed from include/freetype2/internal/ftpic.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/ftrfork.h (renamed from include/freetype2/internal/ftrfork.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/ftserv.h (renamed from include/freetype2/internal/ftserv.h) | 36 | ||||
| -rw-r--r-- | include/freetype/internal/ftstream.h (renamed from include/freetype2/internal/ftstream.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/fttrace.h (renamed from include/freetype2/internal/fttrace.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/ftvalid.h (renamed from include/freetype2/internal/ftvalid.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/internal.h (renamed from include/freetype2/internal/internal.h) | 44 | ||||
| -rw-r--r-- | include/freetype/internal/psaux.h (renamed from include/freetype2/internal/psaux.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/pshints.h (renamed from include/freetype2/internal/pshints.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/services/svbdf.h (renamed from include/freetype2/internal/services/svbdf.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/services/svcid.h (renamed from include/freetype2/internal/services/svcid.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/services/svfntfmt.h (renamed from include/freetype2/internal/services/svfntfmt.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/services/svgldict.h (renamed from include/freetype2/internal/services/svgldict.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/services/svgxval.h (renamed from include/freetype2/internal/services/svgxval.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/services/svkern.h (renamed from include/freetype2/internal/services/svkern.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/services/svmm.h (renamed from include/freetype2/internal/services/svmm.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/services/svotval.h (renamed from include/freetype2/internal/services/svotval.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/services/svpfr.h (renamed from include/freetype2/internal/services/svpfr.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/services/svpostnm.h (renamed from include/freetype2/internal/services/svpostnm.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/services/svprop.h (renamed from include/freetype2/internal/services/svprop.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/services/svpscmap.h (renamed from include/freetype2/internal/services/svpscmap.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/services/svpsinfo.h (renamed from include/freetype2/internal/services/svpsinfo.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/services/svsfnt.h (renamed from include/freetype2/internal/services/svsfnt.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/services/svttcmap.h (renamed from include/freetype2/internal/services/svttcmap.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/services/svtteng.h (renamed from include/freetype2/internal/services/svtteng.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/services/svttglyf.h (renamed from include/freetype2/internal/services/svttglyf.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/services/svwinfnt.h (renamed from include/freetype2/internal/services/svwinfnt.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/sfnt.h (renamed from include/freetype2/internal/sfnt.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/t1types.h (renamed from include/freetype2/internal/t1types.h) | 0 | ||||
| -rw-r--r-- | include/freetype/internal/tttypes.h (renamed from include/freetype2/internal/tttypes.h) | 0 | ||||
| -rw-r--r-- | include/freetype/t1tables.h (renamed from include/freetype2/t1tables.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ttnameid.h (renamed from include/freetype2/ttnameid.h) | 0 | ||||
| -rw-r--r-- | include/freetype/tttables.h (renamed from include/freetype2/tttables.h) | 0 | ||||
| -rw-r--r-- | include/freetype/tttags.h (renamed from include/freetype2/tttags.h) | 0 | ||||
| -rw-r--r-- | include/freetype/ttunpat.h (renamed from include/freetype2/ttunpat.h) | 0 | ||||
| -rw-r--r-- | include/ft2build.h | 2 | ||||
| -rw-r--r-- | modules.cfg | 48 | ||||
| -rw-r--r-- | src/base/ftdebug.c | 2 | ||||
| -rw-r--r-- | src/base/ftinit.c | 2 | ||||
| -rw-r--r-- | src/raster/ftmisc.h | 4 | ||||
| -rw-r--r-- | src/raster/ftraster.c | 4 | ||||
| -rw-r--r-- | src/smooth/ftgrays.c | 4 | ||||
| -rwxr-xr-x | src/tools/chktrcmp.py | 2 | ||||
| -rw-r--r-- | src/tools/docmaker/content.py | 2 |
133 files changed, 370 insertions, 333 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9cd9c8a85..4d88781b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 @@ -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). @@ -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 ; diff --git a/autogen.sh b/autogen.sh index 290dd6083..0693e9f92 100755 --- a/autogen.sh +++ b/autogen.sh @@ -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 diff --git a/builds/amiga/README b/builds/amiga/README index 3ee605701..d0e5ec5d6 100644 --- a/builds/amiga/README +++ b/builds/amiga/README @@ -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. diff --git a/builds/amiga/include/config/ftconfig.h b/builds/amiga/include/config/ftconfig.h index 2f66ff7d5..5ad8ded0f 100644 --- a/builds/amiga/include/config/ftconfig.h +++ b/builds/amiga/include/config/ftconfig.h @@ -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 /* diff --git a/builds/amiga/makefile b/builds/amiga/makefile index 7ff3cab9a..038e4686a 100644 --- a/builds/amiga/makefile +++ b/builds/amiga/makefile @@ -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 diff --git a/builds/amiga/makefile.os4 b/builds/amiga/makefile.os4 index 5350be67e..b7930558e 100644 --- a/builds/amiga/makefile.os4 +++ b/builds/amiga/makefile.os4 @@ -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 diff --git a/builds/amiga/smakefile b/builds/amiga/smakefile index 1081ab03f..145b1ad6e 100644 --- a/builds/amiga/smakefile +++ b/builds/amiga/smakefile @@ -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 \ diff --git a/builds/amiga/src/base/ftdebug.c b/builds/amiga/src/base/ftdebug.c index f48910af4..14c353e3c 100644 --- a/builds/amiga/src/base/ftdebug.c +++ b/builds/amiga/src/base/ftdebug.c @@ -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. */ diff --git a/builds/freetype.mk b/builds/freetype.mk index 7f9e056be..1cc7e29bc 100644 --- a/builds/freetype.mk +++ b/builds/freetype.mk @@ -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 diff --git a/builds/symbian/bld.inf b/builds/symbian/bld.inf index 4480d5037..b5aeb1e5b 100644 --- a/builds/symbian/bld.inf +++ b/builds/symbian/bld.inf @@ -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 diff --git a/builds/toplevel.mk b/builds/toplevel.mk index 05d7ec8dc..243c11330 100644 --- a/builds/toplevel.mk +++ b/builds/toplevel.mk @@ -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)) diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index b828bf095..ec9e7e075 100644 --- a/builds/unix/configure.raw +++ b/builds/unix/configure.raw @@ -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. diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in index 912d77965..a28c65876 100644 --- a/builds/unix/freetype-config.in +++ b/builds/unix/freetype-config.in @@ -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 diff --git a/builds/unix/freetype2.in b/builds/unix/freetype2.in index 49541b540..c4dfda4ab 100644 --- a/builds/unix/freetype2.in +++ b/builds/unix/freetype2.in @@ -11,4 +11,4 @@ Requires: Requires.private: %REQUIRES_PRIVATE% Libs: -L${libdir} -lfreetype Libs.private: %LIBS_PRIVATE% -Cflags: -I${includedir} +Cflags: -I${includedir}/freetype2 diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in index 03e09db5c..fc5c89ba3 100644 --- a/builds/unix/ftconfig.in +++ b/builds/unix/ftconfig.in @@ -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. */ diff --git a/builds/unix/install.mk b/builds/unix/install.mk index 5b4a19ea0..c7a20a35e 100644 --- a/builds/unix/install.mk +++ b/builds/unix/install.mk @@ -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) diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in index ed9fd1ea8..852968367 100644 --- a/builds/unix/unix-def.in +++ b/builds/unix/unix-def.in @@ -17,7 +17,7 @@ SHELL := @SHELL@ TOP_DIR := $(shell cd $(TOP_DIR); pwd) DELETE := rm -f -DELDIR := @RMDIR@ +DELDIR := rm -rf CAT := cat SEP := / diff --git a/builds/wince/ftdebug.c b/builds/wince/ftdebug.c index 74c73b56c..17b4d6145 100644 --- a/builds/wince/ftdebug.c +++ b/builds/wince/ftdebug.c @@ -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. */ diff --git a/builds/wince/vc2005-ce/freetype.vcproj b/builds/wince/vc2005-ce/freetype.vcproj index 210296667..f555dcf42 100644 --- a/builds/wince/vc2005-ce/freetype.vcproj +++ b/builds/wince/vc2005-ce/freetype.vcproj @@ -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>
diff --git a/builds/wince/vc2008-ce/freetype.vcproj b/builds/wince/vc2008-ce/freetype.vcproj index 70fa5176a..3032b4b3f 100644 --- a/builds/wince/vc2008-ce/freetype.vcproj +++ b/builds/wince/vc2008-ce/freetype.vcproj @@ -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>
diff --git a/builds/windows/ftdebug.c b/builds/windows/ftdebug.c index 2adcc52b4..09c3b65a7 100644 --- a/builds/windows/ftdebug.c +++ b/builds/windows/ftdebug.c @@ -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. */ diff --git a/builds/windows/vc2005/freetype.vcproj b/builds/windows/vc2005/freetype.vcproj index 6cd6cffdc..d02d370fd 100644 --- a/builds/windows/vc2005/freetype.vcproj +++ b/builds/windows/vc2005/freetype.vcproj @@ -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>
diff --git a/builds/windows/vc2008/freetype.vcproj b/builds/windows/vc2008/freetype.vcproj index 15dce3dfd..28cbc1f99 100644 --- a/builds/windows/vc2008/freetype.vcproj +++ b/builds/windows/vc2008/freetype.vcproj @@ -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>
diff --git a/builds/windows/vc2010/freetype.vcxproj b/builds/windows/vc2010/freetype.vcxproj index 5fef864b6..2c2556111 100644 --- a/builds/windows/vc2010/freetype.vcxproj +++ b/builds/windows/vc2010/freetype.vcxproj @@ -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">
diff --git a/builds/windows/vc2010/freetype.vcxproj.filters b/builds/windows/vc2010/freetype.vcxproj.filters index 9b7c0615c..29cb5c906 100644 --- a/builds/windows/vc2010/freetype.vcxproj.filters +++ b/builds/windows/vc2010/freetype.vcxproj.filters @@ -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>
diff --git a/builds/windows/visualc/freetype.dsp b/builds/windows/visualc/freetype.dsp index f41296549..0a7bd7be1 100644 --- a/builds/windows/visualc/freetype.dsp +++ b/builds/windows/visualc/freetype.dsp @@ -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
diff --git a/builds/windows/visualc/freetype.vcproj b/builds/windows/visualc/freetype.vcproj index d5baa4b6d..a7da92f6e 100644 --- a/builds/windows/visualc/freetype.vcproj +++ b/builds/windows/visualc/freetype.vcproj @@ -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>
diff --git a/builds/windows/visualce/freetype.dsp b/builds/windows/visualce/freetype.dsp index f41296549..0a7bd7be1 100644 --- a/builds/windows/visualce/freetype.dsp +++ b/builds/windows/visualce/freetype.dsp @@ -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
diff --git a/builds/windows/visualce/freetype.vcproj b/builds/windows/visualce/freetype.vcproj index dcd384b20..65821d1fa 100644 --- a/builds/windows/visualce/freetype.vcproj +++ b/builds/windows/visualce/freetype.vcproj @@ -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>
diff --git a/devel/ft2build.h b/devel/ft2build.h index 67aaa948e..b9eade2dd 100644 --- a/devel/ft2build.h +++ b/devel/ft2build.h @@ -32,7 +32,7 @@ #define FT_CONFIG_OPTIONS_H <ftoption.h> -#include <freetype2/config/ftheader.h> +#include <freetype/config/ftheader.h> #endif /* __FT2BUILD_H__ */ diff --git a/devel/ftoption.h b/devel/ftoption.h index 0bfc24bc4..eda772e84 100644 --- a/devel/ftoption.h +++ b/devel/ftoption.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. */ /* */ diff --git a/docs/CHANGES b/docs/CHANGES index 865ba83dc..7f3c3d749 100644 --- a/docs/CHANGES +++ b/docs/CHANGES @@ -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 diff --git a/docs/CUSTOMIZE b/docs/CUSTOMIZE index 612beb793..42fc31381 100644 --- a/docs/CUSTOMIZE +++ b/docs/CUSTOMIZE @@ -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__ */ diff --git a/docs/INSTALL.ANY b/docs/INSTALL.ANY index aa0bbb767..23b66e46c 100644 --- a/docs/INSTALL.ANY +++ b/docs/INSTALL.ANY @@ -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. diff --git a/docs/release b/docs/release index 7fe45477c..4c692e9eb 100644 --- a/docs/release +++ b/docs/release @@ -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 diff --git a/include/freetype2/config/ftconfig.h b/include/freetype/config/ftconfig.h index d4d79936d..d4d79936d 100644 --- a/include/freetype2/config/ftconfig.h +++ b/include/freetype/config/ftconfig.h diff --git a/include/freetype2/config/ftheader.h b/include/freetype/config/ftheader.h index f9419f5e0..55f833db0 100644 --- a/include/freetype2/config/ftheader.h +++ b/include/freetype/config/ftheader.h @@ -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 */ diff --git a/include/freetype2/config/ftmodule.h b/include/freetype/config/ftmodule.h index 76d271a74..76d271a74 100644 --- a/include/freetype2/config/ftmodule.h +++ b/include/freetype/config/ftmodule.h diff --git a/include/freetype2/config/ftoption.h b/include/freetype/config/ftoption.h index 390464517..4970945d1 100644 --- a/include/freetype2/config/ftoption.h +++ b/include/freetype/config/ftoption.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. */ /* */ diff --git a/include/freetype2/config/ftstdlib.h b/include/freetype/config/ftstdlib.h index 8ef43c04b..8ef43c04b 100644 --- a/include/freetype2/config/ftstdlib.h +++ b/include/freetype/config/ftstdlib.h diff --git a/include/freetype2/freetype.h b/include/freetype/freetype.h index 31f9e11f4..31f9e11f4 100644 --- a/include/freetype2/freetype.h +++ b/include/freetype/freetype.h diff --git a/include/freetype2/ftadvanc.h b/include/freetype/ftadvanc.h index b4d2aed56..b4d2aed56 100644 --- a/include/freetype2/ftadvanc.h +++ b/include/freetype/ftadvanc.h diff --git a/include/freetype2/ftautoh.h b/include/freetype/ftautoh.h index cf7b76f49..cf7b76f49 100644 --- a/include/freetype2/ftautoh.h +++ b/include/freetype/ftautoh.h diff --git a/include/freetype2/ftbbox.h b/include/freetype/ftbbox.h index 9d9d04076..9d9d04076 100644 --- a/include/freetype2/ftbbox.h +++ b/include/freetype/ftbbox.h diff --git a/include/freetype2/ftbdf.h b/include/freetype/ftbdf.h index 0bdabf481..0bdabf481 100644 --- a/include/freetype2/ftbdf.h +++ b/include/freetype/ftbdf.h diff --git a/include/freetype2/ftbitmap.h b/include/freetype/ftbitmap.h index 46cc47b7d..46cc47b7d 100644 --- a/include/freetype2/ftbitmap.h +++ b/include/freetype/ftbitmap.h diff --git a/include/freetype2/ftbzip2.h b/include/freetype/ftbzip2.h index c25f9469d..c25f9469d 100644 --- a/include/freetype2/ftbzip2.h +++ b/include/freetype/ftbzip2.h diff --git a/include/freetype2/ftcache.h b/include/freetype/ftcache.h index 68525bb82..68525bb82 100644 --- a/include/freetype2/ftcache.h +++ b/include/freetype/ftcache.h diff --git a/include/freetype2/ftcffdrv.h b/include/freetype/ftcffdrv.h index 6c8e416ce..6c8e416ce 100644 --- a/include/freetype2/ftcffdrv.h +++ b/include/freetype/ftcffdrv.h diff --git a/include/freetype2/ftchapters.h b/include/freetype/ftchapters.h index d333761c8..d333761c8 100644 --- a/include/freetype2/ftchapters.h +++ b/include/freetype/ftchapters.h diff --git a/include/freetype2/ftcid.h b/include/freetype/ftcid.h index 05741c85b..05741c85b 100644 --- a/include/freetype2/ftcid.h +++ b/include/freetype/ftcid.h diff --git a/include/freetype2/fterrdef.h b/include/freetype/fterrdef.h index 1bf0751b1..1bf0751b1 100644 --- a/include/freetype2/fterrdef.h +++ b/include/freetype/fterrdef.h diff --git a/include/freetype2/fterrors.h b/include/freetype/fterrors.h index 376bee6f8..376bee6f8 100644 --- a/include/freetype2/fterrors.h +++ b/include/freetype/fterrors.h diff --git a/include/freetype2/ftfntfmt.h b/include/freetype/ftfntfmt.h index 1f8ff28f1..1f8ff28f1 100644 --- a/include/freetype2/ftfntfmt.h +++ b/include/freetype/ftfntfmt.h diff --git a/include/freetype2/ftgasp.h b/include/freetype/ftgasp.h index 9a9b6321b..9a9b6321b 100644 --- a/include/freetype2/ftgasp.h +++ b/include/freetype/ftgasp.h diff --git a/include/freetype2/ftglyph.h b/include/freetype/ftglyph.h index 803ad3962..803ad3962 100644 --- a/include/freetype2/ftglyph.h +++ b/include/freetype/ftglyph.h diff --git a/include/freetype2/ftgxval.h b/include/freetype/ftgxval.h index 0e9ac1dad..0e9ac1dad 100644 --- a/include/freetype2/ftgxval.h +++ b/include/freetype/ftgxval.h diff --git a/include/freetype2/ftgzip.h b/include/freetype/ftgzip.h index b3a532d5e..b3a532d5e 100644 --- a/include/freetype2/ftgzip.h +++ b/include/freetype/ftgzip.h diff --git a/include/freetype2/ftimage.h b/include/freetype/ftimage.h index 82f284c4f..82f284c4f 100644 --- a/include/freetype2/ftimage.h +++ b/include/freetype/ftimage.h diff --git a/include/freetype2/ftincrem.h b/include/freetype/ftincrem.h index 840af25b0..840af25b0 100644 --- a/include/freetype2/ftincrem.h +++ b/include/freetype/ftincrem.h diff --git a/include/freetype2/ftlcdfil.h b/include/freetype/ftlcdfil.h index 4cd999a4b..4cd999a4b 100644 --- a/include/freetype2/ftlcdfil.h +++ b/include/freetype/ftlcdfil.h diff --git a/include/freetype2/ftlist.h b/include/freetype/ftlist.h index 12b48c78f..12b48c78f 100644 --- a/include/freetype2/ftlist.h +++ b/include/freetype/ftlist.h diff --git a/include/freetype2/ftlzw.h b/include/freetype/ftlzw.h index d3ec28e55..d3ec28e55 100644 --- a/include/freetype2/ftlzw.h +++ b/include/freetype/ftlzw.h diff --git a/include/freetype2/ftmac.h b/include/freetype/ftmac.h index 14c55cfe2..14c55cfe2 100644 --- a/include/freetype2/ftmac.h +++ b/include/freetype/ftmac.h diff --git a/include/freetype2/ftmm.h b/include/freetype/ftmm.h index 6ef47987e..6ef47987e 100644 --- a/include/freetype2/ftmm.h +++ b/include/freetype/ftmm.h diff --git a/include/freetype2/ftmodapi.h b/include/freetype/ftmodapi.h index 2ef3f4674..2ef3f4674 100644 --- a/include/freetype2/ftmodapi.h +++ b/include/freetype/ftmodapi.h diff --git a/include/freetype2/ftmoderr.h b/include/freetype/ftmoderr.h index 9d7f98140..9d7f98140 100644 --- a/include/freetype2/ftmoderr.h +++ b/include/freetype/ftmoderr.h diff --git a/include/freetype2/ftotval.h b/include/freetype/ftotval.h index e744b713f..e744b713f 100644 --- a/include/freetype2/ftotval.h +++ b/include/freetype/ftotval.h diff --git a/include/freetype2/ftoutln.h b/include/freetype/ftoutln.h index 106cfde06..106cfde06 100644 --- a/include/freetype2/ftoutln.h +++ b/include/freetype/ftoutln.h diff --git a/include/freetype2/ftpfr.h b/include/freetype/ftpfr.h index a1c02a2f5..a1c02a2f5 100644 --- a/include/freetype2/ftpfr.h +++ b/include/freetype/ftpfr.h diff --git a/include/freetype2/ftrender.h b/include/freetype/ftrender.h index ec8da700b..ec8da700b 100644 --- a/include/freetype2/ftrender.h +++ b/include/freetype/ftrender.h diff --git a/include/freetype2/ftsizes.h b/include/freetype/ftsizes.h index bef842471..bef842471 100644 --- a/include/freetype2/ftsizes.h +++ b/include/freetype/ftsizes.h diff --git a/include/freetype2/ftsnames.h b/include/freetype/ftsnames.h index 0f7fbe174..0f7fbe174 100644 --- a/include/freetype2/ftsnames.h +++ b/include/freetype/ftsnames.h diff --git a/include/freetype2/ftstroke.h b/include/freetype/ftstroke.h index 7ebb1e740..7ebb1e740 100644 --- a/include/freetype2/ftstroke.h +++ b/include/freetype/ftstroke.h diff --git a/include/freetype2/ftsynth.h b/include/freetype/ftsynth.h index fbcbad871..fbcbad871 100644 --- a/include/freetype2/ftsynth.h +++ b/include/freetype/ftsynth.h diff --git a/include/freetype2/ftsystem.h b/include/freetype/ftsystem.h index 2bc999910..2bc999910 100644 --- a/include/freetype2/ftsystem.h +++ b/include/freetype/ftsystem.h diff --git a/include/freetype2/fttrigon.h b/include/freetype/fttrigon.h index 3d821ba16..3d821ba16 100644 --- a/include/freetype2/fttrigon.h +++ b/include/freetype/fttrigon.h diff --git a/include/freetype2/ftttdrv.h b/include/freetype/ftttdrv.h index f56040b82..f56040b82 100644 --- a/include/freetype2/ftttdrv.h +++ b/include/freetype/ftttdrv.h diff --git a/include/freetype2/fttypes.h b/include/freetype/fttypes.h index 706a1be4e..706a1be4e 100644 --- a/include/freetype2/fttypes.h +++ b/include/freetype/fttypes.h diff --git a/include/freetype2/ftwinfnt.h b/include/freetype/ftwinfnt.h index caedaa1cc..caedaa1cc 100644 --- a/include/freetype2/ftwinfnt.h +++ b/include/freetype/ftwinfnt.h diff --git a/include/freetype2/internal/autohint.h b/include/freetype/internal/autohint.h index 8d5a9773c..8d5a9773c 100644 --- a/include/freetype2/internal/autohint.h +++ b/include/freetype/internal/autohint.h diff --git a/include/freetype2/internal/ftcalc.h b/include/freetype/internal/ftcalc.h index 75752c3d9..75752c3d9 100644 --- a/include/freetype2/internal/ftcalc.h +++ b/include/freetype/internal/ftcalc.h diff --git a/include/freetype2/internal/ftdebug.h b/include/freetype/internal/ftdebug.h index 216c73031..216c73031 100644 --- a/include/freetype2/internal/ftdebug.h +++ b/include/freetype/internal/ftdebug.h diff --git a/include/freetype2/internal/ftdriver.h b/include/freetype/internal/ftdriver.h index 16856d3df..16856d3df 100644 --- a/include/freetype2/internal/ftdriver.h +++ b/include/freetype/internal/ftdriver.h diff --git a/include/freetype2/internal/ftgloadr.h b/include/freetype/internal/ftgloadr.h index 970dd70cc..970dd70cc 100644 --- a/include/freetype2/internal/ftgloadr.h +++ b/include/freetype/internal/ftgloadr.h diff --git a/include/freetype2/internal/ftmemory.h b/include/freetype/internal/ftmemory.h index c0c553b4f..c0c553b4f 100644 --- a/include/freetype2/internal/ftmemory.h +++ b/include/freetype/internal/ftmemory.h diff --git a/include/freetype2/internal/ftobjs.h b/include/freetype/internal/ftobjs.h index da5582dc3..da5582dc3 100644 --- a/include/freetype2/internal/ftobjs.h +++ b/include/freetype/internal/ftobjs.h diff --git a/include/freetype2/internal/ftpic.h b/include/freetype/internal/ftpic.h index 7f9154f41..7f9154f41 100644 --- a/include/freetype2/internal/ftpic.h +++ b/include/freetype/internal/ftpic.h diff --git a/include/freetype2/internal/ftrfork.h b/include/freetype/internal/ftrfork.h index da61ca75b..da61ca75b 100644 --- a/include/freetype2/internal/ftrfork.h +++ b/include/freetype/internal/ftrfork.h diff --git a/include/freetype2/internal/ftserv.h b/include/freetype/internal/ftserv.h index b0b9e1063..11a0c7f3d 100644 --- a/include/freetype2/internal/ftserv.h +++ b/include/freetype/internal/ftserv.h @@ -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> /* */ diff --git a/include/freetype2/internal/ftstream.h b/include/freetype/internal/ftstream.h index 384e5df30..384e5df30 100644 --- a/include/freetype2/internal/ftstream.h +++ b/include/freetype/internal/ftstream.h diff --git a/include/freetype2/internal/fttrace.h b/include/freetype/internal/fttrace.h index 9d28d214d..9d28d214d 100644 --- a/include/freetype2/internal/fttrace.h +++ b/include/freetype/internal/fttrace.h diff --git a/include/freetype2/internal/ftvalid.h b/include/freetype/internal/ftvalid.h index 9cda6eef5..9cda6eef5 100644 --- a/include/freetype2/internal/ftvalid.h +++ b/include/freetype/internal/ftvalid.h diff --git a/include/freetype2/internal/internal.h b/include/freetype/internal/internal.h index a3f93a153..809ce59c9 100644 --- a/include/freetype2/internal/internal.h +++ b/include/freetype/internal/internal.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_TRUETYPE_TYPES_H <freetype2/internal/tttypes.h> -#define FT_INTERNAL_TYPE1_TYPES_H <freetype2/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_AUTOHINT_H <freetype2/internal/autohint.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 <freetype/internal/tttypes.h> +#define FT_INTERNAL_TYPE1_TYPES_H <freetype/internal/t1types.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 <freetype/internal/autohint.h> #if defined( _MSC_VER ) /* Visual C++ (and Intel C++) */ diff --git a/include/freetype2/internal/psaux.h b/include/freetype/internal/psaux.h index 1c5f784f5..1c5f784f5 100644 --- a/include/freetype2/internal/psaux.h +++ b/include/freetype/internal/psaux.h diff --git a/include/freetype2/internal/pshints.h b/include/freetype/internal/pshints.h index 12aaabacd..12aaabacd 100644 --- a/include/freetype2/internal/pshints.h +++ b/include/freetype/internal/pshints.h diff --git a/include/freetype2/internal/services/svbdf.h b/include/freetype/internal/services/svbdf.h index 865b53687..865b53687 100644 --- a/include/freetype2/internal/services/svbdf.h +++ b/include/freetype/internal/services/svbdf.h diff --git a/include/freetype2/internal/services/svcid.h b/include/freetype/internal/services/svcid.h index 4a535a6f4..4a535a6f4 100644 --- a/include/freetype2/internal/services/svcid.h +++ b/include/freetype/internal/services/svcid.h diff --git a/include/freetype2/internal/services/svfntfmt.h b/include/freetype/internal/services/svfntfmt.h index f8b361736..f8b361736 100644 --- a/include/freetype2/internal/services/svfntfmt.h +++ b/include/freetype/internal/services/svfntfmt.h diff --git a/include/freetype2/internal/services/svgldict.h b/include/freetype/internal/services/svgldict.h index f78bca5d7..f78bca5d7 100644 --- a/include/freetype2/internal/services/svgldict.h +++ b/include/freetype/internal/services/svgldict.h diff --git a/include/freetype2/internal/services/svgxval.h b/include/freetype/internal/services/svgxval.h index 59cc3b704..59cc3b704 100644 --- a/include/freetype2/internal/services/svgxval.h +++ b/include/freetype/internal/services/svgxval.h diff --git a/include/freetype2/internal/services/svkern.h b/include/freetype/internal/services/svkern.h index bc26f1594..bc26f1594 100644 --- a/include/freetype2/internal/services/svkern.h +++ b/include/freetype/internal/services/svkern.h diff --git a/include/freetype2/internal/services/svmm.h b/include/freetype/internal/services/svmm.h index f2cecfbb3..f2cecfbb3 100644 --- a/include/freetype2/internal/services/svmm.h +++ b/include/freetype/internal/services/svmm.h diff --git a/include/freetype2/internal/services/svotval.h b/include/freetype/internal/services/svotval.h index a82a6420f..a82a6420f 100644 --- a/include/freetype2/internal/services/svotval.h +++ b/include/freetype/internal/services/svotval.h diff --git a/include/freetype2/internal/services/svpfr.h b/include/freetype/internal/services/svpfr.h index d4eb1693d..d4eb1693d 100644 --- a/include/freetype2/internal/services/svpfr.h +++ b/include/freetype/internal/services/svpfr.h diff --git a/include/freetype2/internal/services/svpostnm.h b/include/freetype/internal/services/svpostnm.h index a89f79e47..a89f79e47 100644 --- a/include/freetype2/internal/services/svpostnm.h +++ b/include/freetype/internal/services/svpostnm.h diff --git a/include/freetype2/internal/services/svprop.h b/include/freetype/internal/services/svprop.h index c9f07ce33..c9f07ce33 100644 --- a/include/freetype2/internal/services/svprop.h +++ b/include/freetype/internal/services/svprop.h diff --git a/include/freetype2/internal/services/svpscmap.h b/include/freetype/internal/services/svpscmap.h index 66da6e104..66da6e104 100644 --- a/include/freetype2/internal/services/svpscmap.h +++ b/include/freetype/internal/services/svpscmap.h diff --git a/include/freetype2/internal/services/svpsinfo.h b/include/freetype/internal/services/svpsinfo.h index 752a26602..752a26602 100644 --- a/include/freetype2/internal/services/svpsinfo.h +++ b/include/freetype/internal/services/svpsinfo.h diff --git a/include/freetype2/internal/services/svsfnt.h b/include/freetype/internal/services/svsfnt.h index 252ae1cf5..252ae1cf5 100644 --- a/include/freetype2/internal/services/svsfnt.h +++ b/include/freetype/internal/services/svsfnt.h diff --git a/include/freetype2/internal/services/svttcmap.h b/include/freetype/internal/services/svttcmap.h index 4351a9ae0..4351a9ae0 100644 --- a/include/freetype2/internal/services/svttcmap.h +++ b/include/freetype/internal/services/svttcmap.h diff --git a/include/freetype2/internal/services/svtteng.h b/include/freetype/internal/services/svtteng.h index 272ee8c05..272ee8c05 100644 --- a/include/freetype2/internal/services/svtteng.h +++ b/include/freetype/internal/services/svtteng.h diff --git a/include/freetype2/internal/services/svttglyf.h b/include/freetype/internal/services/svttglyf.h index f5cb76a9f..f5cb76a9f 100644 --- a/include/freetype2/internal/services/svttglyf.h +++ b/include/freetype/internal/services/svttglyf.h diff --git a/include/freetype2/internal/services/svwinfnt.h b/include/freetype/internal/services/svwinfnt.h index 0036929b2..0036929b2 100644 --- a/include/freetype2/internal/services/svwinfnt.h +++ b/include/freetype/internal/services/svwinfnt.h diff --git a/include/freetype2/internal/sfnt.h b/include/freetype/internal/sfnt.h index 97ce390c3..97ce390c3 100644 --- a/include/freetype2/internal/sfnt.h +++ b/include/freetype/internal/sfnt.h diff --git a/include/freetype2/internal/t1types.h b/include/freetype/internal/t1types.h index 029acc400..029acc400 100644 --- a/include/freetype2/internal/t1types.h +++ b/include/freetype/internal/t1types.h diff --git a/include/freetype2/internal/tttypes.h b/include/freetype/internal/tttypes.h index 31dd0aac6..31dd0aac6 100644 --- a/include/freetype2/internal/tttypes.h +++ b/include/freetype/internal/tttypes.h diff --git a/include/freetype2/t1tables.h b/include/freetype/t1tables.h index a6ea415af..a6ea415af 100644 --- a/include/freetype2/t1tables.h +++ b/include/freetype/t1tables.h diff --git a/include/freetype2/ttnameid.h b/include/freetype/ttnameid.h index c9585f241..c9585f241 100644 --- a/include/freetype2/ttnameid.h +++ b/include/freetype/ttnameid.h diff --git a/include/freetype2/tttables.h b/include/freetype/tttables.h index 1568f4036..1568f4036 100644 --- a/include/freetype2/tttables.h +++ b/include/freetype/tttables.h diff --git a/include/freetype2/tttags.h b/include/freetype/tttags.h index 3836c7bbf..3836c7bbf 100644 --- a/include/freetype2/tttags.h +++ b/include/freetype/tttags.h diff --git a/include/freetype2/ttunpat.h b/include/freetype/ttunpat.h index 8ea556895..8ea556895 100644 --- a/include/freetype2/ttunpat.h +++ b/include/freetype/ttunpat.h diff --git a/include/ft2build.h b/include/ft2build.h index 9483d3307..419b80ae4 100644 --- a/include/ft2build.h +++ b/include/ft2build.h @@ -34,7 +34,7 @@ #ifndef __FT2BUILD_H__ #define __FT2BUILD_H__ -#include <freetype2/config/ftheader.h> +#include <freetype/config/ftheader.h> #endif /* __FT2BUILD_H__ */ diff --git a/modules.cfg b/modules.cfg index 3d70a7c72..2984e5124 100644 --- a/modules.cfg +++ b/modules.cfg @@ -19,7 +19,7 @@ # activate a module, remove the comment character. # # Note that many modules and components are further controlled with macros -# in the file `include/freetype2/config/ftoption.h'. +# in the file `include/freetype/config/ftoption.h'. #### @@ -85,7 +85,7 @@ HINTING_MODULES += autofit HINTING_MODULES += pshinter # The TrueType hinting engine doesn't have a module of its own but is -# controlled in file include/freetype2/config/ftoption.h +# controlled in file include/freetype/config/ftoption.h # (TT_CONFIG_OPTION_BYTECODE_INTERPRETER and friends). @@ -106,7 +106,7 @@ RASTER_MODULES += smooth # FreeType's cache sub-system (quite stable but still in beta -- this means # that its public API is subject to change if necessary). See -# include/freetype2/ftcache.h. Needs ftglyph.c. +# include/freetype/ftcache.h. Needs ftglyph.c. AUX_MODULES += cache # TrueType GX/AAT table validation. Needs ftgxval.c below. @@ -114,17 +114,17 @@ AUX_MODULES += cache # Support for streams compressed with gzip (files with suffix .gz). # -# See include/freetype2/ftgzip.h for the API. +# See include/freetype/ftgzip.h for the API. AUX_MODULES += gzip # Support for streams compressed with LZW (files with suffix .Z). # -# See include/freetype2/ftlzw.h for the API. +# See include/freetype/ftlzw.h for the API. AUX_MODULES += lzw # Support for streams compressed with bzip2 (files with suffix .bz2). # -# See include/freetype2/ftbzip2.h for the API. +# See include/freetype/ftbzip2.h for the API. AUX_MODULES += bzip2 # OpenType table validation. Needs ftotval.c below. @@ -149,95 +149,95 @@ AUX_MODULES += psnames # Exact bounding box calculation. # -# See include/freetype2/ftbbox.h for the API. +# See include/freetype/ftbbox.h for the API. BASE_EXTENSIONS += ftbbox.c # Access BDF-specific strings. Needs BDF font driver. # -# See include/freetype2/ftbdf.h for the API. +# See include/freetype/ftbdf.h for the API. BASE_EXTENSIONS += ftbdf.c # Utility functions for converting 1bpp, 2bpp, 4bpp, and 8bpp bitmaps into # 8bpp format, and for emboldening of bitmap glyphs. # -# See include/freetype2/ftbitmap.h for the API. +# See include/freetype/ftbitmap.h for the API. BASE_EXTENSIONS += ftbitmap.c # Access CID font information. # -# See include/freetype2/ftcid.h for the API. +# See include/freetype/ftcid.h for the API. BASE_EXTENSIONS += ftcid.c # Support functions for font formats. # -# See include/freetype2/ftfntfmt.h for the API. +# See include/freetype/ftfntfmt.h for the API. BASE_EXTENSIONS += ftfntfmt.c # Access FSType information. Needs fttype1.c. # -# See include/freetype2/freetype.h for the API. +# See include/freetype/freetype.h for the API. BASE_EXTENSIONS += ftfstype.c # Support for GASP table queries. # -# See include/freetype2/ftgasp.h for the API. +# See include/freetype/ftgasp.h for the API. BASE_EXTENSIONS += ftgasp.c # Convenience functions to handle glyphs. Needs ftbitmap.c. # -# See include/freetype2/ftglyph.h for the API. +# See include/freetype/ftglyph.h for the API. BASE_EXTENSIONS += ftglyph.c # Interface for gxvalid module. # -# See include/freetype2/ftgxval.h for the API. +# See include/freetype/ftgxval.h for the API. BASE_EXTENSIONS += ftgxval.c # Support for LCD color filtering of subpixel bitmaps. # -# See include/freetype2/ftlcdfil.h for the API. +# See include/freetype/ftlcdfil.h for the API. BASE_EXTENSIONS += ftlcdfil.c # Multiple Master font interface. # -# See include/freetype2/ftmm.h for the API. +# See include/freetype/ftmm.h for the API. BASE_EXTENSIONS += ftmm.c # Interface for otvalid module. # -# See include/freetype2/ftotval.h for the API. +# See include/freetype/ftotval.h for the API. BASE_EXTENSIONS += ftotval.c # Support for FT_Face_CheckTrueTypePatents. # -# See include/freetype2/freetype.h for the API. +# See include/freetype/freetype.h for the API. BASE_EXTENSIONS += ftpatent.c # Interface for accessing PFR-specific data. Needs PFR font driver. # -# See include/freetype2/ftpfr.h for the API. +# See include/freetype/ftpfr.h for the API. BASE_EXTENSIONS += ftpfr.c # Path stroker. Needs ftglyph.c. # -# See include/freetype2/ftstroke.h for the API. +# See include/freetype/ftstroke.h for the API. BASE_EXTENSIONS += ftstroke.c # Support for synthetic embolding and slanting of fonts. Needs ftbitmap.c. # -# See include/freetype2/ftsynth.h for the API. +# See include/freetype/ftsynth.h for the API. BASE_EXTENSIONS += ftsynth.c # Interface to access data specific to PostScript Type 1 and Type 2 (CFF) # fonts. # -# See include/freetype2/t1tables.h for the API. +# See include/freetype/t1tables.h for the API. BASE_EXTENSIONS += fttype1.c # Interface for accessing data specific to Windows FNT files. Needs winfnt # driver. # -# See include/freetype2/ftwinfnt.h for the API. +# See include/freetype/ftwinfnt.h for the API. BASE_EXTENSIONS += ftwinfnt.c #### diff --git a/src/base/ftdebug.c b/src/base/ftdebug.c index bbbcca8dd..03e18a869 100644 --- a/src/base/ftdebug.c +++ b/src/base/ftdebug.c @@ -152,7 +152,7 @@ /* the memory and stream components which are set to 7 and 5, */ /* respectively. */ /* */ - /* See the file <include/freetype2/internal/fttrace.h> for details of */ + /* 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 */ diff --git a/src/base/ftinit.c b/src/base/ftinit.c index 72d4dc9c2..b65a91d06 100644 --- a/src/base/ftinit.c +++ b/src/base/ftinit.c @@ -23,7 +23,7 @@ /* FT_Add_Default_Modules(): */ /* This function is used to add the set of default modules to a */ /* fresh new library object. The set is taken from the header file */ - /* `freetype2/config/ftmodule.h'. See the document `FreeType 2.0 */ + /* `freetype/config/ftmodule.h'. See the document `FreeType 2.0 */ /* Build System' for more information. */ /* */ /* FT_Init_FreeType(): */ diff --git a/src/raster/ftmisc.h b/src/raster/ftmisc.h index 19be4cadc..b87e0b62b 100644 --- a/src/raster/ftmisc.h +++ b/src/raster/ftmisc.h @@ -37,7 +37,7 @@ #define FT_LOCAL_DEF( x ) static x - /* from include/freetype2/fttypes.h */ + /* from include/freetype/fttypes.h */ typedef unsigned char FT_Byte; typedef signed int FT_Int; @@ -54,7 +54,7 @@ (FT_ULong)_x4 ) - /* from include/freetype2/ftsystem.h */ + /* from include/freetype/ftsystem.h */ typedef struct FT_MemoryRec_* FT_Memory; diff --git a/src/raster/ftraster.c b/src/raster/ftraster.c index 73ab05537..373f5d2f8 100644 --- a/src/raster/ftraster.c +++ b/src/raster/ftraster.c @@ -24,8 +24,8 @@ /* */ /* - copy `src/raster/ftraster.c' (this file) to your current directory */ /* */ - /* - copy `include/freetype2/ftimage.h' and `src/raster/ftmisc.h' to */ - /* your current directory */ + /* - copy `include/freetype/ftimage.h' and `src/raster/ftmisc.h' to your */ + /* current directory */ /* */ /* - compile `ftraster' with the _STANDALONE_ macro defined, as in */ /* */ diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c index cc14a0578..a9317e914 100644 --- a/src/smooth/ftgrays.c +++ b/src/smooth/ftgrays.c @@ -24,8 +24,8 @@ /* */ /* - copy `src/smooth/ftgrays.c' (this file) to your current directory */ /* */ - /* - copy `include/freetype2/ftimage.h' and `src/smooth/ftgrays.h' to */ - /* the same directory */ + /* - copy `include/freetype/ftimage.h' and `src/smooth/ftgrays.h' to the */ + /* same directory */ /* */ /* - compile `ftgrays' with the _STANDALONE_ macro defined, as in */ /* */ diff --git a/src/tools/chktrcmp.py b/src/tools/chktrcmp.py index 802cb2475..4c40bdafd 100755 --- a/src/tools/chktrcmp.py +++ b/src/tools/chktrcmp.py @@ -15,7 +15,7 @@ USED_COMPONENT = {} KNOWN_COMPONENT = {} SRC_FILE_DIRS = [ "src" ] -TRACE_DEF_FILES = [ "include/freetype2/internal/fttrace.h" ] +TRACE_DEF_FILES = [ "include/freetype/internal/fttrace.h" ] # -------------------------------------------------------------- diff --git a/src/tools/docmaker/content.py b/src/tools/docmaker/content.py index 322477ef0..1961878a7 100644 --- a/src/tools/docmaker/content.py +++ b/src/tools/docmaker/content.py @@ -53,7 +53,7 @@ re_identifier = re.compile( r'((?:\w|-)*)' ) # # We collect macro names ending in `_H' (group 1), as defined in -# `freetype2/config/ftheader.h'. While outputting the object data, we use +# `freetype/config/ftheader.h'. While outputting the object data, we use # this info together with the object's file location (group 2) to emit the # appropriate header file macro and its associated file name before the # object itself. |