Update to freetype 2.10.2. Tested by krw@ and myself.

Adds supprot for WOFF2 fonts. No visible API/ABI changes.
This commit is contained in:
matthieu 2020-06-27 09:06:07 +00:00
parent cb3c6b9276
commit 6dd6f885f2
591 changed files with 6152 additions and 1351 deletions

View File

@ -1,6 +1,6 @@
# CMakeLists.txt # CMakeLists.txt
# #
# Copyright (C) 2013-2019 by # Copyright (C) 2013-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# Written originally by John Cary <cary@txcorp.com> # Written originally by John Cary <cary@txcorp.com>
@ -14,14 +14,14 @@
# #
# The following will 1. create a build directory and 2. change into it and # The following will 1. create a build directory and 2. change into it and
# call cmake to configure the build with default parameters as a static # call cmake to configure the build with default parameters as a static
# library. # library. See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html
# for information about Debug, Release, etc. builds.
# #
# cmake -E make_directory build # cmake -B build -D CMAKE_BUILD_TYPE=Release
# cmake -E chdir build cmake ..
# #
# For a dynamic library, use # For a dynamic library, use
# #
# cmake -E chdir build cmake -D BUILD_SHARED_LIBS:BOOL=true .. # cmake -B build -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release
# #
# For a framework on OS X, use # For a framework on OS X, use
# #
@ -68,14 +68,26 @@
# . `CMakeLists.txt' is provided as-is since it is normally not used by the # . `CMakeLists.txt' is provided as-is since it is normally not used by the
# developer team. # developer team.
# #
# . Set the `FT_WITH_ZLIB', `FT_WITH_BZIP2', `FT_WITH_PNG', and # . Set the `FT_WITH_ZLIB', `FT_WITH_BZIP2', `FT_WITH_PNG',
# `FT_WITH_HARFBUZZ' CMake variables to `ON' to force using a dependency. # `FT_WITH_HARFBUZZ', and `FT_WITH_BROTLI' CMake variables to `ON' to
# Leave a variable undefined (which is the default) to use the dependency # force using a dependency. Leave a variable undefined (which is the
# only if it is available. Set `CMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE' to # default) to use the dependency only if it is available. Example:
# disable a dependency completely (CMake package name, so `BZip2' instead of
# `BZIP2'). Example:
# #
# cmake -DFT_WITH_ZLIB=ON -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE [...] # cmake -B build -D FT_WITH_ZLIB=ON \
# -D FT_WITH_BZIP2=ON \
# -D FT_WITH_PNG=ON \
# -D FT_WITH_HARFBUZZ=ON \
# -D FT_WITH_BROTLI=ON [...]
#
# Set `CMAKE_DISABLE_FIND_PACKAGE_XXX=TRUE' to disable a dependency completely
# (where `XXX' is a CMake package name like `BZip2'). Example for disabling all
# dependencies:
#
# cmake -B build -D CMAKE_DISABLE_FIND_PACKAGE_ZLIB=TRUE \
# -D CMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE \
# -D CMAKE_DISABLE_FIND_PACKAGE_PNG=TRUE \
# -D CMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE \
# -D CMAKE_DISABLE_FIND_PACKAGE_BrotliDec=TRUE [...]
# #
# . Installation of FreeType can be controlled with the CMake variables # . Installation of FreeType can be controlled with the CMake variables
# `SKIP_INSTALL_HEADERS', `SKIP_INSTALL_LIBRARIES', and `SKIP_INSTALL_ALL' # `SKIP_INSTALL_HEADERS', `SKIP_INSTALL_LIBRARIES', and `SKIP_INSTALL_ALL'
@ -89,7 +101,7 @@ cmake_minimum_required(VERSION 2.8.12)
if (NOT CMAKE_VERSION VERSION_LESS 3.3) if (NOT CMAKE_VERSION VERSION_LESS 3.3)
# Allow symbol visibility settings also on static libraries. CMake < 3.3 # Allow symbol visibility settings also on static libraries. CMake < 3.3
# only sets the propery on a shared library build. # only sets the property on a shared library build.
cmake_policy(SET CMP0063 NEW) cmake_policy(SET CMP0063 NEW)
endif () endif ()
@ -135,26 +147,34 @@ project(freetype C)
set(VERSION_MAJOR "2") set(VERSION_MAJOR "2")
set(VERSION_MINOR "10") set(VERSION_MINOR "10")
set(VERSION_PATCH "1") set(VERSION_PATCH "2")
# SOVERSION scheme: CURRENT.AGE.REVISION # Generate LIBRARY_VERSION and LIBRARY_SOVERSION.
# If there was an incompatible interface change: set(LIBTOOL_REGEX "version_info='([0-9]+):([0-9]+):([0-9]+)'")
# Increment CURRENT. Set AGE and REVISION to 0 file(STRINGS "${PROJECT_SOURCE_DIR}/builds/unix/configure.raw"
# If there was a compatible interface change: VERSION_INFO
# Increment AGE. Set REVISION to 0 REGEX ${LIBTOOL_REGEX})
# If the source code was changed, but there were no interface changes: string(REGEX REPLACE
# Increment REVISION. ${LIBTOOL_REGEX} "\\1"
set(LIBRARY_VERSION "6.16.0") LIBTOOL_CURRENT "${VERSION_INFO}")
set(LIBRARY_SOVERSION "6") string(REGEX REPLACE
${LIBTOOL_REGEX} "\\2"
LIBTOOL_REVISION "${VERSION_INFO}")
string(REGEX REPLACE
${LIBTOOL_REGEX} "\\3"
LIBTOOL_AGE "${VERSION_INFO}")
# These options mean "require x and complain if not found". They'll get # This is what libtool does internally on Unix platforms.
# optionally found anyway. Use `-DCMAKE_DISABLE_FIND_PACKAGE_x=TRUE` to disable math(EXPR LIBRARY_SOVERSION "${LIBTOOL_CURRENT} - ${LIBTOOL_AGE}")
# searching for a packge entirely (x is the CMake package name, so "BZip2" set(LIBRARY_VERSION "${LIBRARY_SOVERSION}.${LIBTOOL_AGE}.${LIBTOOL_REVISION}")
# instead of "BZIP2").
# External dependency library detection is automatic. See the notes at the top
# of this file, for how to force or disable dependencies completely.
option(FT_WITH_ZLIB "Use system zlib instead of internal library." OFF) option(FT_WITH_ZLIB "Use system zlib instead of internal library." OFF)
option(FT_WITH_BZIP2 "Support bzip2 compressed fonts." OFF) option(FT_WITH_BZIP2 "Support bzip2 compressed fonts." OFF)
option(FT_WITH_PNG "Support PNG compressed OpenType embedded bitmaps." OFF) option(FT_WITH_PNG "Support PNG compressed OpenType embedded bitmaps." OFF)
option(FT_WITH_HARFBUZZ "Improve auto-hinting of OpenType fonts." OFF) option(FT_WITH_HARFBUZZ "Improve auto-hinting of OpenType fonts." OFF)
option(FT_WITH_BROTLI "Support compressed WOFF2 fonts." OFF)
# Disallow in-source builds # Disallow in-source builds
@ -185,10 +205,11 @@ endif ()
# Find dependencies # Find dependencies
set(HARFBUZZ_MIN_VERSION "1.8.0")
if (FT_WITH_HARFBUZZ) if (FT_WITH_HARFBUZZ)
find_package(HarfBuzz 1.3.0 REQUIRED) find_package(HarfBuzz ${HARFBUZZ_MIN_VERSION} REQUIRED)
else () else ()
find_package(HarfBuzz 1.3.0) find_package(HarfBuzz ${HARFBUZZ_MIN_VERSION})
endif () endif ()
if (FT_WITH_PNG) if (FT_WITH_PNG)
@ -209,6 +230,12 @@ else ()
find_package(BZip2) find_package(BZip2)
endif () endif ()
if (FT_WITH_BROTLI)
find_package(BrotliDec REQUIRED)
else ()
find_package(BrotliDec)
endif ()
# Create the configuration file # Create the configuration file
if (UNIX) if (UNIX)
check_include_file("unistd.h" HAVE_UNISTD_H) check_include_file("unistd.h" HAVE_UNISTD_H)
@ -273,6 +300,11 @@ if (HARFBUZZ_FOUND)
"/\\* +(#define +FT_CONFIG_OPTION_USE_HARFBUZZ) +\\*/" "\\1" "/\\* +(#define +FT_CONFIG_OPTION_USE_HARFBUZZ) +\\*/" "\\1"
FTOPTION_H "${FTOPTION_H}") FTOPTION_H "${FTOPTION_H}")
endif () endif ()
if (BROTLIDEC_FOUND)
string(REGEX REPLACE
"/\\* +(#define +FT_CONFIG_OPTION_USE_BROTLI) +\\*/" "\\1"
FTOPTION_H "${FTOPTION_H}")
endif ()
set(FTOPTION_H_NAME "${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h") set(FTOPTION_H_NAME "${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h")
if (EXISTS "${FTOPTION_H_NAME}") if (EXISTS "${FTOPTION_H_NAME}")
@ -308,7 +340,6 @@ set(BASE_SRCS
src/base/ftpfr.c src/base/ftpfr.c
src/base/ftstroke.c src/base/ftstroke.c
src/base/ftsynth.c src/base/ftsynth.c
src/base/ftsystem.c
src/base/fttype1.c src/base/fttype1.c
src/base/ftwinfnt.c src/base/ftwinfnt.c
src/bdf/bdf.c src/bdf/bdf.c
@ -332,6 +363,12 @@ set(BASE_SRCS
src/winfonts/winfnt.c src/winfonts/winfnt.c
) )
if (UNIX)
list(APPEND BASE_SRCS "builds/unix/ftsystem.c")
else ()
list(APPEND BASE_SRCS "src/base/ftsystem.c")
endif ()
if (WIN32) if (WIN32)
enable_language(RC) enable_language(RC)
list(APPEND BASE_SRCS builds/windows/ftdebug.c list(APPEND BASE_SRCS builds/windows/ftdebug.c
@ -390,7 +427,11 @@ target_include_directories(
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
PRIVATE PRIVATE
${CMAKE_CURRENT_BINARY_DIR}/include ${CMAKE_CURRENT_BINARY_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/include) ${CMAKE_CURRENT_SOURCE_DIR}/include
# Make <ftconfig.h> available for builds/unix/ftsystem.c.
${CMAKE_CURRENT_BINARY_DIR}/include/freetype/config
)
if (BUILD_FRAMEWORK) if (BUILD_FRAMEWORK)
@ -411,23 +452,29 @@ set(PKG_CONFIG_REQUIRED_PRIVATE "")
if (ZLIB_FOUND) if (ZLIB_FOUND)
target_link_libraries(freetype PRIVATE ${ZLIB_LIBRARIES}) target_link_libraries(freetype PRIVATE ${ZLIB_LIBRARIES})
target_include_directories(freetype PRIVATE ${ZLIB_INCLUDE_DIRS}) target_include_directories(freetype PRIVATE ${ZLIB_INCLUDE_DIRS})
list(APPEND PKG_CONFIG_REQUIRED_PRIVATE zlib) list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "zlib")
endif () endif ()
if (BZIP2_FOUND) if (BZIP2_FOUND)
target_link_libraries(freetype PRIVATE ${BZIP2_LIBRARIES}) target_link_libraries(freetype PRIVATE ${BZIP2_LIBRARIES})
target_include_directories(freetype PRIVATE ${BZIP2_INCLUDE_DIR}) # not BZIP2_INCLUDE_DIRS target_include_directories(freetype PRIVATE ${BZIP2_INCLUDE_DIR}) # not BZIP2_INCLUDE_DIRS
list(APPEND PKG_CONFIG_REQUIRED_PRIVATE bzip2) list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "bzip2")
endif () endif ()
if (PNG_FOUND) if (PNG_FOUND)
target_link_libraries(freetype PRIVATE ${PNG_LIBRARIES}) target_link_libraries(freetype PRIVATE ${PNG_LIBRARIES})
target_compile_definitions(freetype PRIVATE ${PNG_DEFINITIONS}) target_compile_definitions(freetype PRIVATE ${PNG_DEFINITIONS})
target_include_directories(freetype PRIVATE ${PNG_INCLUDE_DIRS}) target_include_directories(freetype PRIVATE ${PNG_INCLUDE_DIRS})
list(APPEND PKG_CONFIG_REQUIRED_PRIVATE libpng) list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "libpng")
endif () endif ()
if (HARFBUZZ_FOUND) if (HARFBUZZ_FOUND)
target_link_libraries(freetype PRIVATE ${HARFBUZZ_LIBRARIES}) target_link_libraries(freetype PRIVATE ${HARFBUZZ_LIBRARIES})
target_include_directories(freetype PRIVATE ${HARFBUZZ_INCLUDE_DIRS}) target_include_directories(freetype PRIVATE ${HARFBUZZ_INCLUDE_DIRS})
list(APPEND PKG_CONFIG_REQUIRED_PRIVATE harfbuzz) list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "harfbuzz >= ${HARFBUZZ_MIN_VERSION}")
endif ()
if (BROTLIDEC_FOUND)
target_link_libraries(freetype PRIVATE ${BROTLIDEC_LIBRARIES})
target_compile_definitions(freetype PRIVATE ${BROTLIDEC_DEFINITIONS})
target_include_directories(freetype PRIVATE ${BROTLIDEC_INCLUDE_DIRS})
list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "libbrotlidec")
endif () endif ()
@ -453,7 +500,7 @@ endif ()
if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
# Generate the pkg-config file # Generate the pkg-config file
if (UNIX) if (UNIX)
file(READ ${PROJECT_SOURCE_DIR}/builds/unix/freetype2.in FREETYPE2_PC_IN) file(READ "${PROJECT_SOURCE_DIR}/builds/unix/freetype2.in" FREETYPE2_PC_IN)
string(REPLACE ";" ", " PKG_CONFIG_REQUIRED_PRIVATE "${PKG_CONFIG_REQUIRED_PRIVATE}") string(REPLACE ";" ", " PKG_CONFIG_REQUIRED_PRIVATE "${PKG_CONFIG_REQUIRED_PRIVATE}")
@ -465,7 +512,7 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
string(REPLACE "%includedir%" "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}" string(REPLACE "%includedir%" "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}"
FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
string(REPLACE "%ft_version%" "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" string(REPLACE "%ft_version%" "${LIBTOOL_CURRENT}.${LIBTOOL_REVISION}.${LIBTOOL_AGE}"
FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
string(REPLACE "%REQUIRES_PRIVATE%" "${PKG_CONFIG_REQUIRED_PRIVATE}" string(REPLACE "%REQUIRES_PRIVATE%" "${PKG_CONFIG_REQUIRED_PRIVATE}"
FREETYPE2_PC_IN ${FREETYPE2_PC_IN}) FREETYPE2_PC_IN ${FREETYPE2_PC_IN})

File diff suppressed because it is too large Load Diff

View File

@ -2597,7 +2597,7 @@
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
Copyright (C) 2000-2019 by Copyright (C) 2000-2020 by
David Turner, Robert Wilhelm, and Werner Lemberg. David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, modified, This file is part of the FreeType project, and may only be used, modified,

View File

@ -9422,7 +9422,7 @@
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
Copyright (C) 2002-2019 by Copyright (C) 2002-2020 by
David Turner, Robert Wilhelm, and Werner Lemberg. David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, modified, This file is part of the FreeType project, and may only be used, modified,

View File

@ -2821,7 +2821,7 @@
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
Copyright (C) 2005-2019 by Copyright (C) 2005-2020 by
David Turner, Robert Wilhelm, and Werner Lemberg. David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, modified, This file is part of the FreeType project, and may only be used, modified,

View File

@ -7932,7 +7932,7 @@
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
Copyright (C) 2006-2019 by Copyright (C) 2006-2020 by
David Turner, Robert Wilhelm, and Werner Lemberg. David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, modified, This file is part of the FreeType project, and may only be used, modified,

View File

@ -6344,7 +6344,7 @@
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
Copyright (C) 2010-2019 by Copyright (C) 2010-2020 by
David Turner, Robert Wilhelm, and Werner Lemberg. David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, modified, This file is part of the FreeType project, and may only be used, modified,

View File

@ -5145,7 +5145,7 @@
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
Copyright (C) 2013-2019 by Copyright (C) 2013-2020 by
David Turner, Robert Wilhelm, and Werner Lemberg. David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, modified, This file is part of the FreeType project, and may only be used, modified,

View File

@ -5695,7 +5695,7 @@
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
Copyright (C) 2015-2019 by Copyright (C) 2015-2020 by
David Turner, Robert Wilhelm, and Werner Lemberg. David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, modified, This file is part of the FreeType project, and may only be used, modified,

View File

@ -2090,7 +2090,7 @@
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
Copyright (C) 2016-2019 by Copyright (C) 2016-2020 by
David Turner, Robert Wilhelm, and Werner Lemberg. David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, modified, This file is part of the FreeType project, and may only be used, modified,

View File

@ -3120,7 +3120,7 @@
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
Copyright (C) 2016-2019 by Copyright (C) 2016-2020 by
David Turner, Robert Wilhelm, and Werner Lemberg. David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, modified, This file is part of the FreeType project, and may only be used, modified,

View File

@ -2336,7 +2336,7 @@
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
Copyright (C) 2017-2019 by Copyright (C) 2017-2020 by
David Turner, Robert Wilhelm, and Werner Lemberg. David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, modified, This file is part of the FreeType project, and may only be used, modified,

View File

@ -1,6 +1,6 @@
# FreeType 2 top Jamfile. # FreeType 2 top Jamfile.
# #
# Copyright (C) 2001-2019 by # Copyright (C) 2001-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,
@ -208,13 +208,14 @@ rule RefDoc
actions RefDoc actions RefDoc
{ {
python -m docwriter python3 -m docwriter
--prefix=ft2 --prefix=ft2
--title=FreeType-2.10.1 --title=FreeType-2.10.2
--output=$(DOC_DIR) --site=reference
$(FT2_INCLUDE)/freetype/*.h --output=$(DOC_DIR)
$(FT2_INCLUDE)/freetype/config/*.h $(FT2_INCLUDE)/freetype/*.h
$(FT2_INCLUDE)/freetype/cache/*.h $(FT2_INCLUDE)/freetype/config/*.h
$(FT2_INCLUDE)/freetype/cache/*.h
} }
RefDoc refdoc ; RefDoc refdoc ;

View File

@ -1,6 +1,6 @@
# FreeType 2 JamRules. # FreeType 2 JamRules.
# #
# Copyright (C) 2001-2019 by # Copyright (C) 2001-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.53 2019/09/13 19:11:23 matthieu Exp $ # $OpenBSD: Makefile,v 1.54 2020/06/27 09:06:07 matthieu Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
FREETYPESRC= ${.CURDIR}/src FREETYPESRC= ${.CURDIR}/src
# Get it from builds/unix/configure.ac # Get it from builds/unix/configure.ac
FT_VERSION_INFO= 23.1.17 FT_VERSION_INFO= 23.2.17
INSTALL_PROGRAM = ${INSTALL} ${INSTALL_COPY} -m 755 -o $(BINOWN) -g $(BINGRP) INSTALL_PROGRAM = ${INSTALL} ${INSTALL_COPY} -m 755 -o $(BINOWN) -g $(BINGRP)
@ -107,4 +107,3 @@ NOPROFILE=
.PATH: ${FREETYPESRC}/winfonts .PATH: ${FREETYPESRC}/winfonts
.include <bsd.subdir.mk> .include <bsd.subdir.mk>

View File

@ -1,4 +1,4 @@
FreeType 2.10.1 FreeType 2.10.2
=============== ===============
Homepage: https://www.freetype.org Homepage: https://www.freetype.org
@ -16,17 +16,20 @@
the file `docs/LICENSE.TXT' for the available licenses. the file `docs/LICENSE.TXT' for the available licenses.
The FreeType 2 API reference is located in `docs/reference/site'; The FreeType 2 API reference is located in `docs/reference/site';
use the file `index.html' as the top entry point. Additional use the file `index.html' as the top entry point. [Please note that
documentation is available as a separate package from our sites. Go currently the search function for locally installed documentation
to doesn't work due to cross-site scripting issues.]
Additional documentation is available as a separate package from our
sites. Go to
https://download.savannah.gnu.org/releases/freetype/ https://download.savannah.gnu.org/releases/freetype/
and download one of the following files. and download one of the following files.
freetype-doc-2.10.1.tar.xz freetype-doc-2.10.2.tar.xz
freetype-doc-2.10.1.tar.gz freetype-doc-2.10.2.tar.gz
ftdoc2101.zip ftdoc2102.zip
To view the documentation online, go to To view the documentation online, go to
@ -71,7 +74,7 @@
---------------------------------------------------------------------- ----------------------------------------------------------------------
Copyright (C) 2006-2019 by Copyright (C) 2006-2020 by
David Turner, Robert Wilhelm, and Werner Lemberg. David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, This file is part of the FreeType project, and may only be used,

View File

@ -37,7 +37,7 @@ repository.
---------------------------------------------------------------------- ----------------------------------------------------------------------
Copyright (C) 2005-2019 by Copyright (C) 2005-2020 by
David Turner, Robert Wilhelm, and Werner Lemberg. David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, This file is part of the FreeType project, and may only be used,

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Copyright (C) 2005-2019 by # Copyright (C) 2005-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -1,7 +1,7 @@
README for the builds/amiga subdirectory. README for the builds/amiga subdirectory.
Copyright (C) 2005-2019 by Copyright (C) 2005-2020 by
Werner Lemberg and Detlef Würkner. Werner Lemberg and Detlef Würkner.
This file is part of the FreeType project, and may only be used, modified, This file is part of the FreeType project, and may only be used, modified,

View File

@ -4,7 +4,7 @@
/* */ /* */
/* Amiga-specific configuration file (specification only). */ /* Amiga-specific configuration file (specification only). */
/* */ /* */
/* Copyright (C) 2005-2019 by */ /* Copyright (C) 2005-2020 by */
/* Werner Lemberg and Detlef Würkner. */ /* Werner Lemberg and Detlef Würkner. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */

View File

@ -4,7 +4,7 @@
/* */ /* */
/* Amiga-specific FreeType module selection. */ /* Amiga-specific FreeType module selection. */
/* */ /* */
/* Copyright (C) 2005-2019 by */ /* Copyright (C) 2005-2020 by */
/* Werner Lemberg and Detlef Würkner. */ /* Werner Lemberg and Detlef Würkner. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */

View File

@ -5,7 +5,7 @@
# #
# Copyright (C) 2005-2019 by # Copyright (C) 2005-2020 by
# Werner Lemberg and Detlef Würkner. # Werner Lemberg and Detlef Würkner.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -4,7 +4,7 @@
# #
# Copyright (C) 2005-2019 by # Copyright (C) 2005-2020 by
# Werner Lemberg and Detlef Würkner. # Werner Lemberg and Detlef Würkner.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 2005-2019 by # Copyright (C) 2005-2020 by
# Werner Lemberg and Detlef Würkner. # Werner Lemberg and Detlef Würkner.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -4,7 +4,7 @@
* *
* Debugging and logging component for amiga (body). * Debugging and logging component for amiga (body).
* *
* Copyright (C) 1996-2019 by * Copyright (C) 1996-2020 by
* David Turner, Robert Wilhelm, Werner Lemberg, and Detlef Wuerkner. * David Turner, Robert Wilhelm, Werner Lemberg, and Detlef Wuerkner.
* *
* This file is part of the FreeType project, and may only be used, * This file is part of the FreeType project, and may only be used,

View File

@ -4,7 +4,7 @@
/* */ /* */
/* Amiga-specific FreeType low-level system interface (body). */ /* Amiga-specific FreeType low-level system interface (body). */
/* */ /* */
/* Copyright (C) 1996-2019 by */ /* Copyright (C) 1996-2020 by */
/* David Turner, Robert Wilhelm, Werner Lemberg and Detlef Würkner. */ /* David Turner, Robert Wilhelm, Werner Lemberg and Detlef Würkner. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -5,7 +5,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -2,7 +2,7 @@
# FreeType 2 configuration rules for a BeOS system # FreeType 2 configuration rules for a BeOS system
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -0,0 +1,51 @@
# FindBrotliDec.cmake
#
# Copyright (C) 2019-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# Written by Werner Lemberg <wl@gnu.org>
#
# This file is part of the FreeType project, and may only be used, modified,
# and distributed under the terms of the FreeType project license,
# LICENSE.TXT. By continuing to use, modify, or distribute this file you
# indicate that you have read the license and understand and accept it
# fully.
#
#
# Try to find libbrotlidec include and library directories.
#
# If found, the following variables are set.
#
# BROTLIDEC_INCLUDE_DIRS
# BROTLIDEC_LIBRARIES
include(FindPkgConfig)
pkg_check_modules(PC_BROTLIDEC QUIET libbrotlidec)
if (PC_BROTLIDEC_VERSION)
set(BROTLIDEC_VERSION "${PC_BROTLIDEC_VERSION}")
endif ()
find_path(BROTLIDEC_INCLUDE_DIRS
NAMES brotli/decode.h
HINTS ${PC_BROTLIDEC_INCLUDEDIR}
${PC_BROTLIDEC_INCLUDE_DIRS}
PATH_SUFFIXES brotli)
find_library(BROTLIDEC_LIBRARIES
NAMES brotlidec
HINTS ${PC_BROTLIDEC_LIBDIR}
${PC_BROTLIDEC_LIBRARY_DIRS})
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(
brotlidec
REQUIRED_VARS BROTLIDEC_INCLUDE_DIRS BROTLIDEC_LIBRARIES
FOUND_VAR BROTLIDEC_FOUND
VERSION_VAR BROTLIDEC_VERSION)
mark_as_advanced(
BROTLIDEC_INCLUDE_DIRS
BROTLIDEC_LIBRARIES)

View File

@ -23,59 +23,65 @@
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE. # POSSIBILITY OF SUCH DAMAGE.
#
# Try to find Harfbuzz include and library directories.
# Try to find HarfBuzz include and library directories.
# #
# After successful discovery, this will set for inclusion where needed: # After successful discovery, this will set for inclusion where needed:
# HARFBUZZ_INCLUDE_DIRS - containg the HarfBuzz headers #
# HARFBUZZ_LIBRARIES - containg the HarfBuzz library # HARFBUZZ_INCLUDE_DIRS - containg the HarfBuzz headers
# HARFBUZZ_LIBRARIES - containg the HarfBuzz library
include(FindPkgConfig) include(FindPkgConfig)
pkg_check_modules(PC_HARFBUZZ QUIET harfbuzz) pkg_check_modules(PC_HARFBUZZ QUIET harfbuzz)
find_path(HARFBUZZ_INCLUDE_DIRS find_path(HARFBUZZ_INCLUDE_DIRS
NAMES hb.h NAMES hb.h
HINTS ${PC_HARFBUZZ_INCLUDEDIR} HINTS ${PC_HARFBUZZ_INCLUDEDIR}
${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDE_DIRS}
PATH_SUFFIXES harfbuzz PATH_SUFFIXES harfbuzz)
)
find_library(HARFBUZZ_LIBRARIES NAMES harfbuzz find_library(HARFBUZZ_LIBRARIES
HINTS ${PC_HARFBUZZ_LIBDIR} NAMES harfbuzz
${PC_HARFBUZZ_LIBRARY_DIRS} HINTS ${PC_HARFBUZZ_LIBDIR}
) ${PC_HARFBUZZ_LIBRARY_DIRS})
if (HARFBUZZ_INCLUDE_DIRS) if (HARFBUZZ_INCLUDE_DIRS)
if (EXISTS "${HARFBUZZ_INCLUDE_DIRS}/hb-version.h") if (EXISTS "${HARFBUZZ_INCLUDE_DIRS}/hb-version.h")
file(READ "${HARFBUZZ_INCLUDE_DIRS}/hb-version.h" _harfbuzz_version_content) file(READ "${HARFBUZZ_INCLUDE_DIRS}/hb-version.h" _harfbuzz_version_content)
string(REGEX MATCH "#define +HB_VERSION_STRING +\"([0-9]+\\.[0-9]+\\.[0-9]+)\"" _dummy "${_harfbuzz_version_content}") string(REGEX MATCH
set(HARFBUZZ_VERSION "${CMAKE_MATCH_1}") "#define +HB_VERSION_STRING +\"([0-9]+\\.[0-9]+\\.[0-9]+)\""
endif () _dummy "${_harfbuzz_version_content}")
set(HARFBUZZ_VERSION "${CMAKE_MATCH_1}")
endif ()
endif () endif ()
if ("${harfbuzz_FIND_VERSION}" VERSION_GREATER "${HARFBUZZ_VERSION}") if ("${harfbuzz_FIND_VERSION}" VERSION_GREATER "${HARFBUZZ_VERSION}")
message(FATAL_ERROR "Required version (" ${harfbuzz_FIND_VERSION} ") is higher than found version (" ${HARFBUZZ_VERSION} ")") message(FATAL_ERROR
"Required version (" ${harfbuzz_FIND_VERSION} ")"
" is higher than found version (" ${HARFBUZZ_VERSION} ")")
endif () endif ()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS( find_package_handle_standard_args(
harfbuzz harfbuzz
REQUIRED_VARS HARFBUZZ_INCLUDE_DIRS HARFBUZZ_LIBRARIES REQUIRED_VARS HARFBUZZ_INCLUDE_DIRS HARFBUZZ_LIBRARIES
VERSION_VAR HARFBUZZ_VERSION) VERSION_VAR HARFBUZZ_VERSION)
mark_as_advanced( mark_as_advanced(
HARFBUZZ_INCLUDE_DIRS HARFBUZZ_INCLUDE_DIRS
HARFBUZZ_LIBRARIES HARFBUZZ_LIBRARIES)
)
# Allows easy linking as in # Allow easy linking as in
#
# target_link_libraries(freetype PRIVATE Harfbuzz::Harfbuzz) # target_link_libraries(freetype PRIVATE Harfbuzz::Harfbuzz)
#
if (NOT CMAKE_VERSION VERSION_LESS 3.1) if (NOT CMAKE_VERSION VERSION_LESS 3.1)
if (HARFBUZZ_FOUND AND NOT TARGET Harfbuzz::Harfbuzz) if (HARFBUZZ_FOUND AND NOT TARGET Harfbuzz::Harfbuzz)
add_library(Harfbuzz::Harfbuzz INTERFACE IMPORTED) add_library(Harfbuzz::Harfbuzz INTERFACE IMPORTED)
set_target_properties( set_target_properties(
Harfbuzz::Harfbuzz PROPERTIES Harfbuzz::Harfbuzz PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${HARFBUZZ_INCLUDE_DIRS}") INTERFACE_INCLUDE_DIRECTORIES "${HARFBUZZ_INCLUDE_DIRS}")
endif () endif ()
endif () endif ()

View File

@ -1,6 +1,6 @@
# iOS.cmake # iOS.cmake
# #
# Copyright (C) 2014-2019 by # Copyright (C) 2014-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# Written by David Wimsey <david@wimsey.us> # Written by David Wimsey <david@wimsey.us>

View File

@ -1,6 +1,6 @@
#!/bin/sh -e #!/bin/sh -e
# Copyright (C) 2015-2019 by # Copyright (C) 2015-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 2003-2019 by # Copyright (C) 2003-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,
@ -120,7 +120,7 @@ std_setup:
$(info `$(CONFIG_MK)' from this directory then read the INSTALL file for help.) $(info `$(CONFIG_MK)' from this directory then read the INSTALL file for help.)
$(info ) $(info )
$(info Otherwise, simply type `$(MAKE)' again to build the library,) $(info Otherwise, simply type `$(MAKE)' again to build the library,)
$(info or `$(MAKE) refdoc' to build the API reference (this needs python >= 2.6).) $(info or `$(MAKE) refdoc' to build the API reference (this needs Python >= 3.5).)
$(info ) $(info )
@$(COPY) $(subst /,$(SEP),$(CONFIG_RULES) $(CONFIG_MK)) @$(COPY) $(subst /,$(SEP),$(CONFIG_RULES) $(CONFIG_MK))

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 2003-2019 by # Copyright (C) 2003-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 2003-2019 by # Copyright (C) 2003-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 2005-2019 by # Copyright (C) 2005-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,
@ -104,7 +104,7 @@ CONFIG_DIR := $(PUBLIC_DIR)/config
# The documentation directory. # The documentation directory.
# #
DOC_DIR ?= $(TOP_DIR)/docs/reference DOC_DIR ?= $(TOP_DIR)/docs
# The final name of the library file. # The final name of the library file.
# #
@ -126,12 +126,14 @@ INCLUDES := $(subst /,$(COMPILER_SEP),$(OBJ_DIR) \
INCLUDE_FLAGS := $(INCLUDES:%=$I%) INCLUDE_FLAGS := $(INCLUDES:%=$I%)
# For a development build, we assume that the external library dependencies
# defined in `ftoption.h' are fulfilled, so we directly access the necessary
# include directory information using `pkg-config'.
#
ifdef DEVEL_DIR ifdef DEVEL_DIR
# We assume that all library dependencies for FreeType are fulfilled for a INCLUDE_FLAGS += $(shell pkg-config --cflags libpng)
# development build, so we directly access the necessary include directory INCLUDE_FLAGS += $(shell pkg-config --cflags harfbuzz)
# information using `pkg-config'. INCLUDE_FLAGS += $(shell pkg-config --cflags libbrotlidec)
INCLUDE_FLAGS += $(shell pkg-config --cflags libpng \
harfbuzz )
endif endif
@ -146,25 +148,13 @@ endif
# FreeType. This is required to let our sources include the internal # FreeType. This is required to let our sources include the internal
# headers (something forbidden by clients). # headers (something forbidden by clients).
# #
# Finally, we define FT_CONFIG_MODULES_H so that the compiler uses the
# generated version of `ftmodule.h' in $(OBJ_DIR). If there is an
# `ftoption.h' files in $(OBJ_DIR), define FT_CONFIG_OPTIONS_H too.
#
ifneq ($(wildcard $(OBJ_DIR)/ftoption.h),)
FTOPTION_H := $(OBJ_DIR)/ftoption.h
FTOPTION_FLAG := $DFT_CONFIG_OPTIONS_H="<ftoption.h>"
else ifneq ($(wildcard $(BUILD_DIR)/ftoption.h),)
FTOPTION_H := $(BUILD_DIR)/ftoption.h
FTOPTION_FLAG := $DFT_CONFIG_OPTIONS_H="<ftoption.h>"
endif
# `CPPFLAGS' might be specified by the user in the environment. # `CPPFLAGS' might be specified by the user in the environment.
# #
FT_CFLAGS = $(CPPFLAGS) \ FT_CFLAGS = $(CPPFLAGS) \
$(CFLAGS) \ $(CFLAGS) \
$DFT2_BUILD_LIBRARY \ $DFT2_BUILD_LIBRARY
$DFT_CONFIG_MODULES_H="<ftmodule.h>" \
$(FTOPTION_FLAG) FT_COMPILE := $(CC) $(ANSIFLAGS) $(INCLUDE_FLAGS) $(FT_CFLAGS)
# Include the `exports' rules file. # Include the `exports' rules file.
@ -179,11 +169,17 @@ OBJECTS_LIST :=
# Define $(PUBLIC_H) as the list of all public header files located in # Define $(PUBLIC_H) as the list of all public header files located in
# `$(TOP_DIR)/include/freetype'. $(INTERNAL_H), and $(CONFIG_H) are defined # `$(TOP_DIR)/include/freetype'. $(INTERNAL_H), and $(CONFIG_H) are defined
# similarly. # similarly. $(FTOPTION_H) is the option file used in the compilation.
# #
# This is used to simplify the dependency rules -- if one of these files # This is used to simplify the dependency rules -- if one of these files
# changes, the whole library is recompiled. # changes, the whole library is recompiled.
# #
ifneq ($(wildcard $(OBJ_DIR)/ftoption.h),)
FTOPTION_H := $(OBJ_DIR)/ftoption.h
else ifneq ($(wildcard $(BUILD_DIR)/ftoption.h),)
FTOPTION_H := $(BUILD_DIR)/ftoption.h
endif
PUBLIC_H := $(wildcard $(PUBLIC_DIR)/*.h) PUBLIC_H := $(wildcard $(PUBLIC_DIR)/*.h)
INTERNAL_H := $(wildcard $(INTERNAL_DIR)/*.h) \ INTERNAL_H := $(wildcard $(INTERNAL_DIR)/*.h) \
$(wildcard $(SERVICES_DIR)/*.h) $(wildcard $(SERVICES_DIR)/*.h)
@ -196,8 +192,6 @@ DEVEL_H := $(wildcard $(TOP_DIR)/devel/*.h)
FREETYPE_H := $(PUBLIC_H) $(INTERNAL_H) $(CONFIG_H) $(DEVEL_H) FREETYPE_H := $(PUBLIC_H) $(INTERNAL_H) $(CONFIG_H) $(DEVEL_H)
FT_COMPILE := $(CC) $(ANSIFLAGS) $(INCLUDE_FLAGS) $(FT_CFLAGS)
# ftsystem component # ftsystem component
# #
FTSYS_SRC ?= $(BASE_DIR)/ftsystem.c FTSYS_SRC ?= $(BASE_DIR)/ftsystem.c
@ -290,17 +284,15 @@ objects: $(OBJECTS_LIST)
library: $(PROJECT_LIBRARY) library: $(PROJECT_LIBRARY)
# Run `docwriter' in the current Python environment. # Run `docwriter' in the current Python environment.
# Option `-B' disables generation of .pyc files (available since python 2.6)
# #
PYTHON ?= python PYTHON ?= python
PIP ?= pip
refdoc: refdoc:
@echo Running docwriter... @echo Running docwriter...
$(PYTHON) -m docwriter \ $(PYTHON) -m docwriter \
--prefix=ft2 \ --prefix=ft2 \
--title=FreeType-$(version) \ --title=FreeType-$(version) \
--site=reference \
--output=$(DOC_DIR) \ --output=$(DOC_DIR) \
$(PUBLIC_DIR)/*.h \ $(PUBLIC_DIR)/*.h \
$(PUBLIC_DIR)/config/*.h \ $(PUBLIC_DIR)/config/*.h \
@ -318,17 +310,17 @@ refdoc:
VENV_NAME := env VENV_NAME := env
VENV_DIR := $(DOC_DIR)$(SEP)$(VENV_NAME) VENV_DIR := $(DOC_DIR)$(SEP)$(VENV_NAME)
ENV_PYTHON := $(VENV_DIR)$(SEP)$(BIN)$(SEP)$(PYTHON) ENV_PYTHON := $(VENV_DIR)$(SEP)$(BIN)$(SEP)$(PYTHON)
ENV_PIP := $(VENV_DIR)$(SEP)$(BIN)$(SEP)$(PIP)
refdoc-venv: refdoc-venv:
@echo Setting up virtualenv for Python... @echo Setting up virtualenv for Python...
virtualenv --python=$(PYTHON) $(VENV_DIR) virtualenv --python=$(PYTHON) $(VENV_DIR)
@echo Installing docwriter... @echo Installing docwriter...
$(ENV_PIP) install docwriter $(ENV_PYTHON) -m pip install docwriter
@echo Running docwriter... @echo Running docwriter...
$(ENV_PYTHON) -m docwriter \ $(ENV_PYTHON) -m docwriter \
--prefix=ft2 \ --prefix=ft2 \
--title=FreeType-$(version) \ --title=FreeType-$(version) \
--site=reference \
--output=$(DOC_DIR) \ --output=$(DOC_DIR) \
$(PUBLIC_DIR)/*.h \ $(PUBLIC_DIR)/*.h \
$(PUBLIC_DIR)/config/*.h \ $(PUBLIC_DIR)/config/*.h \

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -5,7 +5,7 @@
/* Mac FOND support. Written by just@letterror.com. */ /* Mac FOND support. Written by just@letterror.com. */
/* Heavily Fixed by mpsuzuki, George Williams and Sean McBride */ /* Heavily Fixed by mpsuzuki, George Williams and Sean McBride */
/* */ /* */
/* Copyright (C) 1996-2019 by */ /* Copyright (C) 1996-2020 by */
/* Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg. */ /* Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -5,7 +5,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -2,7 +2,7 @@
// FreeType 2 project for the symbian platform // FreeType 2 project for the symbian platform
// //
// Copyright (C) 2008-2019 by // Copyright (C) 2008-2020 by
// David Turner, Robert Wilhelm, and Werner Lemberg. // David Turner, Robert Wilhelm, and Werner Lemberg.
// //
// This file is part of the FreeType project, and may only be used, modified, // This file is part of the FreeType project, and may only be used, modified,

View File

@ -2,7 +2,7 @@
// FreeType 2 makefile for the symbian platform // FreeType 2 makefile for the symbian platform
// //
// Copyright (C) 2008-2019 by // Copyright (C) 2008-2020 by
// David Turner, Robert Wilhelm, and Werner Lemberg. // David Turner, Robert Wilhelm, and Werner Lemberg.
// //
// This file is part of the FreeType project, and may only be used, modified, // This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,
@ -268,7 +268,7 @@ do-dist: distclean refdoc
cp $(CONFIG_SUB) builds/unix cp $(CONFIG_SUB) builds/unix
@# Remove intermediate files created by the `refdoc' target. @# Remove intermediate files created by the `refdoc' target.
rm -rf docs/reference/markdown rm -rf docs/markdown
rm -f docs/reference/mkdocs.yml rm -f docs/mkdocs.yml
# EOF # EOF

View File

@ -0,0 +1,177 @@
# ===========================================================================
# https://www.gnu.org/software/autoconf-archive/ax_compare_version.html
# ===========================================================================
#
# SYNOPSIS
#
# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
#
# DESCRIPTION
#
# This macro compares two version strings. Due to the various number of
# minor-version numbers that can exist, and the fact that string
# comparisons are not compatible with numeric comparisons, this is not
# necessarily trivial to do in a autoconf script. This macro makes doing
# these comparisons easy.
#
# The six basic comparisons are available, as well as checking equality
# limited to a certain number of minor-version levels.
#
# The operator OP determines what type of comparison to do, and can be one
# of:
#
# eq - equal (test A == B)
# ne - not equal (test A != B)
# le - less than or equal (test A <= B)
# ge - greater than or equal (test A >= B)
# lt - less than (test A < B)
# gt - greater than (test A > B)
#
# Additionally, the eq and ne operator can have a number after it to limit
# the test to that number of minor versions.
#
# eq0 - equal up to the length of the shorter version
# ne0 - not equal up to the length of the shorter version
# eqN - equal up to N sub-version levels
# neN - not equal up to N sub-version levels
#
# When the condition is true, shell commands ACTION-IF-TRUE are run,
# otherwise shell commands ACTION-IF-FALSE are run. The environment
# variable 'ax_compare_version' is always set to either 'true' or 'false'
# as well.
#
# Examples:
#
# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8])
# AX_COMPARE_VERSION([3.15],[lt],[3.15.8])
#
# would both be true.
#
# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8])
# AX_COMPARE_VERSION([3.15],[gt],[3.15.8])
#
# would both be false.
#
# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8])
#
# would be true because it is only comparing two minor versions.
#
# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15])
#
# would be true because it is only comparing the lesser number of minor
# versions of the two values.
#
# Note: The characters that separate the version numbers do not matter. An
# empty string is the same as version 0. OP is evaluated by autoconf, not
# configure, so must be a string, not a variable.
#
# The author would like to acknowledge Guido Draheim whose advice about
# the m4_case and m4_ifvaln functions make this macro only include the
# portions necessary to perform the specific comparison specified by the
# OP argument in the final configure script.
#
# LICENSE
#
# Copyright (c) 2008 Tim Toolan <toolan@ele.uri.edu>
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
# and this notice are preserved. This file is offered as-is, without any
# warranty.
#serial 13
dnl #########################################################################
AC_DEFUN([AX_COMPARE_VERSION], [
AC_REQUIRE([AC_PROG_AWK])
# Used to indicate true or false condition
ax_compare_version=false
# Convert the two version strings to be compared into a format that
# allows a simple string comparison. The end result is that a version
# string of the form 1.12.5-r617 will be converted to the form
# 0001001200050617. In other words, each number is zero padded to four
# digits, and non digits are removed.
AS_VAR_PUSHDEF([A],[ax_compare_version_A])
A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
-e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
-e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-e 's/[[^0-9]]//g'`
AS_VAR_PUSHDEF([B],[ax_compare_version_B])
B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
-e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
-e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-e 's/[[^0-9]]//g'`
dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary
dnl # then the first line is used to determine if the condition is true.
dnl # The sed right after the echo is to remove any indented white space.
m4_case(m4_tolower($2),
[lt],[
ax_compare_version=`echo "x$A
x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"`
],
[gt],[
ax_compare_version=`echo "x$A
x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"`
],
[le],[
ax_compare_version=`echo "x$A
x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"`
],
[ge],[
ax_compare_version=`echo "x$A
x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"`
],[
dnl Split the operator from the subversion count if present.
m4_bmatch(m4_substr($2,2),
[0],[
# A count of zero means use the length of the shorter version.
# Determine the number of characters in A and B.
ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'`
ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'`
# Set A to no more than B's length and B to no more than A's length.
A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"`
B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"`
],
[[0-9]+],[
# A count greater than zero means use only that many subversions
A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
],
[.+],[
AC_WARNING(
[invalid OP numeric parameter: $2])
],[])
# Pad zeros at end of numbers to make same length.
ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`"
B="$B`echo $A | sed 's/./0/g'`"
A="$ax_compare_version_tmp_A"
# Check for equality or inequality as necessary.
m4_case(m4_tolower(m4_substr($2,0,2)),
[eq],[
test "x$A" = "x$B" && ax_compare_version=true
],
[ne],[
test "x$A" != "x$B" && ax_compare_version=true
],[
AC_WARNING([invalid OP parameter: $2])
])
])
AS_VAR_POPDEF([A])dnl
AS_VAR_POPDEF([B])dnl
dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE.
if test "$ax_compare_version" = "true" ; then
m4_ifvaln([$4],[$4],[:])dnl
m4_ifvaln([$5],[else $5])dnl
fi
]) dnl AX_COMPARE_VERSION

View File

@ -0,0 +1,66 @@
# ===========================================================================
# https://www.gnu.org/software/autoconf-archive/ax_prog_python_version.html
# ===========================================================================
#
# SYNOPSIS
#
# AX_PROG_PYTHON_VERSION([VERSION],[ACTION-IF-TRUE],[ACTION-IF-FALSE])
#
# DESCRIPTION
#
# Makes sure that python supports the version indicated. If true the shell
# commands in ACTION-IF-TRUE are executed. If not the shell commands in
# ACTION-IF-FALSE are run. Note if $PYTHON is not set (for example by
# running AC_CHECK_PROG or AC_PATH_PROG) the macro will fail.
#
# Example:
#
# AC_PATH_PROG([PYTHON],[python])
# AX_PROG_PYTHON_VERSION([2.4.4],[ ... ],[ ... ])
#
# This will check to make sure that the python you have supports at least
# version 2.4.4.
#
# NOTE: This macro uses the $PYTHON variable to perform the check.
# AX_WITH_PYTHON can be used to set that variable prior to running this
# macro. The $PYTHON_VERSION variable will be valorized with the detected
# version.
#
# LICENSE
#
# Copyright (c) 2009 Francesco Salvestrini <salvestrini@users.sourceforge.net>
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
# and this notice are preserved. This file is offered as-is, without any
# warranty.
#serial 12
AC_DEFUN([AX_PROG_PYTHON_VERSION],[
AC_REQUIRE([AC_PROG_SED])
AC_REQUIRE([AC_PROG_GREP])
AS_IF([test -n "$PYTHON"],[
ax_python_version="$1"
AC_MSG_CHECKING([for python version])
changequote(<<,>>)
python_version=`$PYTHON -V 2>&1 | $GREP "^Python " | $SED -e 's/^.* \([0-9]*\.[0-9]*\.[0-9]*\)/\1/'`
changequote([,])
AC_MSG_RESULT($python_version)
AC_SUBST([PYTHON_VERSION],[$python_version])
AX_COMPARE_VERSION([$ax_python_version],[le],[$python_version],[
:
$2
],[
:
$3
])
],[
AC_MSG_WARN([could not find the python interpreter])
$3
])
])

View File

@ -2,7 +2,7 @@
# #
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
# #
# Copyright (C) 2001-2019 by # Copyright (C) 2001-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,
@ -11,13 +11,13 @@
# indicate that you have read the license and understand and accept it # indicate that you have read the license and understand and accept it
# fully. # fully.
AC_INIT([FreeType], [2.10.1], [freetype@nongnu.org], [freetype]) AC_INIT([FreeType], [2.10.2], [freetype@nongnu.org], [freetype])
AC_CONFIG_SRCDIR([ftconfig.in]) AC_CONFIG_SRCDIR([ftconfig.in])
# Don't forget to update `docs/VERSIONS.TXT'! # Don't forget to update `docs/VERSIONS.TXT'!
version_info='23:1:17' version_info='23:2:17'
AC_SUBST([version_info]) AC_SUBST([version_info])
ft_version=`echo $version_info | tr : .` ft_version=`echo $version_info | tr : .`
AC_SUBST([ft_version]) AC_SUBST([ft_version])
@ -478,7 +478,7 @@ if test x"$with_png" = xyes -o x"$with_png" = xauto; then
libpng_libsstaticconf="$LIBPNG_LIBS" libpng_libsstaticconf="$LIBPNG_LIBS"
have_libpng="yes (LIBPNG_CFLAGS and LIBPNG_LIBS)" have_libpng="yes (LIBPNG_CFLAGS and LIBPNG_LIBS)"
else else
# fall back to config script. # fall back to config script
AC_MSG_CHECKING([for libpng-config]) AC_MSG_CHECKING([for libpng-config])
if which libpng-config > /dev/null 2>&1; then if which libpng-config > /dev/null 2>&1; then
LIBPNG_CFLAGS=`libpng-config --cflags` LIBPNG_CFLAGS=`libpng-config --cflags`
@ -508,7 +508,7 @@ AC_ARG_WITH([harfbuzz],
have_harfbuzz=no have_harfbuzz=no
if test x"$with_harfbuzz" = xyes -o x"$with_harfbuzz" = xauto; then if test x"$with_harfbuzz" = xyes -o x"$with_harfbuzz" = xauto; then
harfbuzz_pkg="harfbuzz >= 1.3.0" harfbuzz_pkg="harfbuzz >= 1.8.0"
have_harfbuzz_pkg=no have_harfbuzz_pkg=no
if test x"$HARFBUZZ_CFLAGS" = x -a x"$HARFBUZZ_LIBS" = x; then if test x"$HARFBUZZ_CFLAGS" = x -a x"$HARFBUZZ_LIBS" = x; then
@ -543,6 +543,50 @@ if test x"$with_harfbuzz" = xyes -a "$have_harfbuzz" = no; then
fi fi
# check for system libbrotlidec
AC_ARG_WITH([brotli],
[AS_HELP_STRING([--with-brotli=@<:@yes|no|auto@:>@],
[support decompression of WOFF2 streams @<:@default=auto@:>@])],
[], [with_brotli=auto])
have_brotli=no
if test x"$with_brotli" = xyes -o x"$with_brotli" = xauto; then
brotli_pkg="libbrotlidec"
have_brotli_pkg=no
if test x"$BROTLI_CFLAGS" = x -a x"$BROTLI_LIBS" = x; then
PKG_CHECK_EXISTS([$brotli_pkg], [have_brotli_pkg=yes])
fi
PKG_CHECK_MODULES([BROTLI], [$brotli_pkg],
[have_brotli="yes (pkg-config)"], [:])
if test $have_brotli_pkg = yes; then
# we have libbrotlidec.pc
brotli_reqpriv="$brotli_pkg"
brotli_libspriv=
brotli_libsstaticconf=`$PKG_CONFIG --static --libs "$brotli_pkg"`
else
brotli_reqpriv=
if test "$have_brotli" != no; then
# BROTLI_CFLAGS and BROTLI_LIBS are set by the user
brotli_libspriv="$BROTLI_LIBS"
brotli_libsstaticconf="$BROTLI_LIBS"
have_brotli="yes (BROTLI_CFLAGS and BROTLI_LIBS)"
else
# since Brotli is quite a new library we don't fall back to a
# different test
:
fi
fi
fi
if test x"$with_brotli" = xyes -a "$have_brotli" = no; then
AC_MSG_ERROR([brotli support requested but library not found])
fi
# check for librt # check for librt
# #
# We need `clock_gettime' for the `ftbench' demo program. # We need `clock_gettime' for the `ftbench' demo program.
@ -968,16 +1012,20 @@ case "$CFLAGS" in
;; ;;
esac esac
# Check for python and docwriter # Check for Python and docwriter
AC_CHECK_PROGS([PYTHON], [python3 python2 python], [missing]) have_py3=no
have_docwriter=no have_docwriter=no
if test "x$PYTHON" != "xmissing"; then PIP=pip
AC_CHECK_PROGS([PIP], [pip3 pip2 pip], [missing])
if test "x$PIP" != "xmissing"; then AC_CHECK_PROGS([PYTHON], [python3 python], [missing])
if test "x$PYTHON" != "xmissing"; then
AX_PROG_PYTHON_VERSION([3.5], [have_py3=yes], [])
if test "x$have_py3" = "xyes"; then
PIP="$PYTHON -m $PIP"
AC_MSG_CHECKING([for \`docwriter' Python module]) AC_MSG_CHECKING([for \`docwriter' Python module])
$PIP show -q docwriter $PYTHON -m docwriter -h > /dev/null 2>&1
if test "x$?" = "x0"; then if test "x$?" = "x0"; then
have_docwriter=yes have_docwriter=yes
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
@ -988,11 +1036,12 @@ if test "x$PYTHON" != "xmissing"; then
fi fi
# entries in Requires.private are separated by commas; # entries in Requires.private are separated by commas
REQUIRES_PRIVATE="$zlib_reqpriv, \ REQUIRES_PRIVATE="$zlib_reqpriv, \
$bzip2_reqpriv, \ $bzip2_reqpriv, \
$libpng_reqpriv, \ $libpng_reqpriv, \
$harfbuzz_reqpriv" $harfbuzz_reqpriv, \
$brotli_reqpriv"
# beautify # beautify
REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \ REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \
| sed -e 's/^ *//' \ | sed -e 's/^ *//' \
@ -1007,6 +1056,7 @@ LIBS_PRIVATE="$zlib_libspriv \
$bzip2_libspriv \ $bzip2_libspriv \
$libpng_libspriv \ $libpng_libspriv \
$harfbuzz_libspriv \ $harfbuzz_libspriv \
$brotli_libspriv \
$ft2_extra_libs" $ft2_extra_libs"
# beautify # beautify
LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
@ -1019,6 +1069,7 @@ LIBSSTATIC_CONFIG="-lfreetype \
$bzip2_libsstaticconf \ $bzip2_libsstaticconf \
$libpng_libsstaticconf \ $libpng_libsstaticconf \
$harfbuzz_libsstaticconf \ $harfbuzz_libsstaticconf \
$brotli_libsstaticconf \
$ft2_extra_libs" $ft2_extra_libs"
# remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later # remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later
# on if necessary; also beautify # on if necessary; also beautify
@ -1083,6 +1134,13 @@ if test "$have_harfbuzz" != no; then
else else
ftoption_unset FT_CONFIG_OPTION_USE_HARFBUZZ ftoption_unset FT_CONFIG_OPTION_USE_HARFBUZZ
fi fi
if test "$have_brotli" != no; then
CFLAGS="$CFLAGS $BROTLI_CFLAGS"
LDFLAGS="$LDFLAGS $BROTLI_LIBS"
ftoption_set FT_CONFIG_OPTION_USE_BROTLI
else
ftoption_unset FT_CONFIG_OPTION_USE_BROTLI
fi
AC_SUBST([CFLAGS]) AC_SUBST([CFLAGS])
AC_SUBST([LDFLAGS]) AC_SUBST([LDFLAGS])
@ -1129,6 +1187,7 @@ Library configuration:
bzip2: $have_bzip2 bzip2: $have_bzip2
libpng: $have_libpng libpng: $have_libpng
harfbuzz: $have_harfbuzz harfbuzz: $have_harfbuzz
brotli: $have_brotli
]) ])
# Warn if docwriter is not installed # Warn if docwriter is not installed
@ -1136,9 +1195,9 @@ Library configuration:
if test $have_docwriter = no; then if test $have_docwriter = no; then
AC_MSG_NOTICE([ AC_MSG_NOTICE([
Warning: \`make refdoc' will fail since pip package \`docwriter' is not Warning: \`make refdoc' will fail since pip package \`docwriter' is not
installed. To install, run \`$PIP install docwriter', or to use a python installed. To install, run \`$PIP install docwriter', or to use a Python
virtual environment, run \`make refdoc-venv' (requires pip package virtual environment, run \`make refdoc-venv' (requires pip package
\`virtualenv'). \`virtualenv'). These operations require Python >= 3.5.
]) ])
fi fi

View File

@ -2,7 +2,7 @@
# #
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
# #
# Copyright (C) 2001-2019 by # Copyright (C) 2001-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,
@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in])
# Don't forget to update `docs/VERSIONS.TXT'! # Don't forget to update `docs/VERSIONS.TXT'!
version_info='23:1:17' version_info='23:2:17'
AC_SUBST([version_info]) AC_SUBST([version_info])
ft_version=`echo $version_info | tr : .` ft_version=`echo $version_info | tr : .`
AC_SUBST([ft_version]) AC_SUBST([ft_version])
@ -478,7 +478,7 @@ if test x"$with_png" = xyes -o x"$with_png" = xauto; then
libpng_libsstaticconf="$LIBPNG_LIBS" libpng_libsstaticconf="$LIBPNG_LIBS"
have_libpng="yes (LIBPNG_CFLAGS and LIBPNG_LIBS)" have_libpng="yes (LIBPNG_CFLAGS and LIBPNG_LIBS)"
else else
# fall back to config script. # fall back to config script
AC_MSG_CHECKING([for libpng-config]) AC_MSG_CHECKING([for libpng-config])
if which libpng-config > /dev/null 2>&1; then if which libpng-config > /dev/null 2>&1; then
LIBPNG_CFLAGS=`libpng-config --cflags` LIBPNG_CFLAGS=`libpng-config --cflags`
@ -508,7 +508,7 @@ AC_ARG_WITH([harfbuzz],
have_harfbuzz=no have_harfbuzz=no
if test x"$with_harfbuzz" = xyes -o x"$with_harfbuzz" = xauto; then if test x"$with_harfbuzz" = xyes -o x"$with_harfbuzz" = xauto; then
harfbuzz_pkg="harfbuzz >= 1.3.0" harfbuzz_pkg="harfbuzz >= 1.8.0"
have_harfbuzz_pkg=no have_harfbuzz_pkg=no
if test x"$HARFBUZZ_CFLAGS" = x -a x"$HARFBUZZ_LIBS" = x; then if test x"$HARFBUZZ_CFLAGS" = x -a x"$HARFBUZZ_LIBS" = x; then
@ -543,6 +543,50 @@ if test x"$with_harfbuzz" = xyes -a "$have_harfbuzz" = no; then
fi fi
# check for system libbrotlidec
AC_ARG_WITH([brotli],
[AS_HELP_STRING([--with-brotli=@<:@yes|no|auto@:>@],
[support decompression of WOFF2 streams @<:@default=auto@:>@])],
[], [with_brotli=auto])
have_brotli=no
if test x"$with_brotli" = xyes -o x"$with_brotli" = xauto; then
brotli_pkg="libbrotlidec"
have_brotli_pkg=no
if test x"$BROTLI_CFLAGS" = x -a x"$BROTLI_LIBS" = x; then
PKG_CHECK_EXISTS([$brotli_pkg], [have_brotli_pkg=yes])
fi
PKG_CHECK_MODULES([BROTLI], [$brotli_pkg],
[have_brotli="yes (pkg-config)"], [:])
if test $have_brotli_pkg = yes; then
# we have libbrotlidec.pc
brotli_reqpriv="$brotli_pkg"
brotli_libspriv=
brotli_libsstaticconf=`$PKG_CONFIG --static --libs "$brotli_pkg"`
else
brotli_reqpriv=
if test "$have_brotli" != no; then
# BROTLI_CFLAGS and BROTLI_LIBS are set by the user
brotli_libspriv="$BROTLI_LIBS"
brotli_libsstaticconf="$BROTLI_LIBS"
have_brotli="yes (BROTLI_CFLAGS and BROTLI_LIBS)"
else
# since Brotli is quite a new library we don't fall back to a
# different test
:
fi
fi
fi
if test x"$with_brotli" = xyes -a "$have_brotli" = no; then
AC_MSG_ERROR([brotli support requested but library not found])
fi
# check for librt # check for librt
# #
# We need `clock_gettime' for the `ftbench' demo program. # We need `clock_gettime' for the `ftbench' demo program.
@ -968,16 +1012,20 @@ case "$CFLAGS" in
;; ;;
esac esac
# Check for python and docwriter # Check for Python and docwriter
AC_CHECK_PROGS([PYTHON], [python3 python2 python], [missing]) have_py3=no
have_docwriter=no have_docwriter=no
if test "x$PYTHON" != "xmissing"; then PIP=pip
AC_CHECK_PROGS([PIP], [pip3 pip2 pip], [missing])
if test "x$PIP" != "xmissing"; then AC_CHECK_PROGS([PYTHON], [python3 python], [missing])
if test "x$PYTHON" != "xmissing"; then
AX_PROG_PYTHON_VERSION([3.5], [have_py3=yes], [])
if test "x$have_py3" = "xyes"; then
PIP="$PYTHON -m $PIP"
AC_MSG_CHECKING([for \`docwriter' Python module]) AC_MSG_CHECKING([for \`docwriter' Python module])
$PIP show -q docwriter $PYTHON -m docwriter -h > /dev/null 2>&1
if test "x$?" = "x0"; then if test "x$?" = "x0"; then
have_docwriter=yes have_docwriter=yes
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
@ -988,11 +1036,12 @@ if test "x$PYTHON" != "xmissing"; then
fi fi
# entries in Requires.private are separated by commas; # entries in Requires.private are separated by commas
REQUIRES_PRIVATE="$zlib_reqpriv, \ REQUIRES_PRIVATE="$zlib_reqpriv, \
$bzip2_reqpriv, \ $bzip2_reqpriv, \
$libpng_reqpriv, \ $libpng_reqpriv, \
$harfbuzz_reqpriv" $harfbuzz_reqpriv, \
$brotli_reqpriv"
# beautify # beautify
REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \ REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \
| sed -e 's/^ *//' \ | sed -e 's/^ *//' \
@ -1007,6 +1056,7 @@ LIBS_PRIVATE="$zlib_libspriv \
$bzip2_libspriv \ $bzip2_libspriv \
$libpng_libspriv \ $libpng_libspriv \
$harfbuzz_libspriv \ $harfbuzz_libspriv \
$brotli_libspriv \
$ft2_extra_libs" $ft2_extra_libs"
# beautify # beautify
LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
@ -1019,6 +1069,7 @@ LIBSSTATIC_CONFIG="-lfreetype \
$bzip2_libsstaticconf \ $bzip2_libsstaticconf \
$libpng_libsstaticconf \ $libpng_libsstaticconf \
$harfbuzz_libsstaticconf \ $harfbuzz_libsstaticconf \
$brotli_libsstaticconf \
$ft2_extra_libs" $ft2_extra_libs"
# remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later # remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later
# on if necessary; also beautify # on if necessary; also beautify
@ -1083,6 +1134,13 @@ if test "$have_harfbuzz" != no; then
else else
ftoption_unset FT_CONFIG_OPTION_USE_HARFBUZZ ftoption_unset FT_CONFIG_OPTION_USE_HARFBUZZ
fi fi
if test "$have_brotli" != no; then
CFLAGS="$CFLAGS $BROTLI_CFLAGS"
LDFLAGS="$LDFLAGS $BROTLI_LIBS"
ftoption_set FT_CONFIG_OPTION_USE_BROTLI
else
ftoption_unset FT_CONFIG_OPTION_USE_BROTLI
fi
AC_SUBST([CFLAGS]) AC_SUBST([CFLAGS])
AC_SUBST([LDFLAGS]) AC_SUBST([LDFLAGS])
@ -1129,6 +1187,7 @@ Library configuration:
bzip2: $have_bzip2 bzip2: $have_bzip2
libpng: $have_libpng libpng: $have_libpng
harfbuzz: $have_harfbuzz harfbuzz: $have_harfbuzz
brotli: $have_brotli
]) ])
# Warn if docwriter is not installed # Warn if docwriter is not installed
@ -1136,9 +1195,9 @@ Library configuration:
if test $have_docwriter = no; then if test $have_docwriter = no; then
AC_MSG_NOTICE([ AC_MSG_NOTICE([
Warning: \`make refdoc' will fail since pip package \`docwriter' is not Warning: \`make refdoc' will fail since pip package \`docwriter' is not
installed. To install, run \`$PIP install docwriter', or to use a python installed. To install, run \`$PIP install docwriter', or to use a Python
virtual environment, run \`make refdoc-venv' (requires pip package virtual environment, run \`make refdoc-venv' (requires pip package
\`virtualenv'). \`virtualenv'). These operations require Python >= 3.5.
]) ])
fi fi

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# #
# Copyright (C) 2000-2019 by # Copyright (C) 2000-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -1,7 +1,7 @@
# Configure paths for FreeType2 # Configure paths for FreeType2
# Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor # Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor
# #
# Copyright (C) 2001-2019 by # Copyright (C) 2001-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -1,6 +1,6 @@
## FreeType specific autoconf tests ## FreeType specific autoconf tests
# #
# Copyright (C) 2002-2019 by # Copyright (C) 2002-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -4,7 +4,7 @@
* *
* UNIX-specific configuration file (specification only). * UNIX-specific configuration file (specification only).
* *
* Copyright (C) 1996-2019 by * Copyright (C) 1996-2020 by
* David Turner, Robert Wilhelm, and Werner Lemberg. * David Turner, Robert Wilhelm, and Werner Lemberg.
* *
* This file is part of the FreeType project, and may only be used, * This file is part of the FreeType project, and may only be used,

View File

@ -4,7 +4,7 @@
/* */ /* */
/* Unix-specific FreeType low-level system interface (body). */ /* Unix-specific FreeType low-level system interface (body). */
/* */ /* */
/* Copyright (C) 1996-2019 by */ /* Copyright (C) 1996-2020 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -2,7 +2,7 @@
# FreeType 2 template for Unix-specific compiler definitions # FreeType 2 template for Unix-specific compiler definitions
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,
@ -76,10 +76,13 @@ T := -o$(space)
# Use the ANSIFLAGS variable to define the compiler flags used to enfore # Use the ANSIFLAGS variable to define the compiler flags used to enfore
# ANSI compliance. # ANSI compliance.
# #
# We use our own FreeType configuration file. # We use our own FreeType configuration files overriding defaults.
# #
CPPFLAGS := @CPPFLAGS@ CPPFLAGS := @CPPFLAGS@
CFLAGS := -c @XX_CFLAGS@ @CFLAGS@ -DFT_CONFIG_CONFIG_H="<ftconfig.h>" CFLAGS := -c @XX_CFLAGS@ @CFLAGS@ \
$DFT_CONFIG_CONFIG_H="<ftconfig.h>" \
$DFT_CONFIG_MODULES_H="<ftmodule.h>" \
$DFT_CONFIG_OPTIONS_H="<ftoption.h>"
# ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
# #
@ -87,8 +90,12 @@ ANSIFLAGS := @XX_ANSIFLAGS@
# C compiler to use -- we use libtool! # C compiler to use -- we use libtool!
# #
CCraw := $(CC) # CC might be set on the command line; we store this value in `CCraw'.
CC := $(LIBTOOL) --mode=compile $(CCraw) # Consequently, we use the `override' directive to ensure that the
# libtool call is always prepended.
#
CCraw := $(CC)
override CC := $(LIBTOOL) --mode=compile $(CCraw)
# Resource compiler to use on Cygwin/MinGW, usually windres. # Resource compiler to use on Cygwin/MinGW, usually windres.
# #

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,
@ -24,7 +24,6 @@ SEP := /
# This is used for `make refdoc' and `make refdoc-venv' # This is used for `make refdoc' and `make refdoc-venv'
# #
PYTHON := @PYTHON@ PYTHON := @PYTHON@
PIP := @PIP@
BIN := bin BIN := bin
# this is used for `make distclean' and `make install' # this is used for `make distclean' and `make install'

View File

@ -6,7 +6,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -6,7 +6,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -4,7 +4,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -4,7 +4,7 @@
* *
* VMS-specific configuration file (specification only). * VMS-specific configuration file (specification only).
* *
* Copyright (C) 1996-2019 by * Copyright (C) 1996-2020 by
* David Turner, Robert Wilhelm, and Werner Lemberg. * David Turner, Robert Wilhelm, and Werner Lemberg.
* *
* This file is part of the FreeType project, and may only be used, * This file is part of the FreeType project, and may only be used,

View File

@ -4,7 +4,7 @@
/* */ /* */
/* VMS-specific FreeType low-level system interface (body). */ /* VMS-specific FreeType low-level system interface (body). */
/* */ /* */
/* Copyright (C) 1996-2019 by */ /* Copyright (C) 1996-2020 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */

View File

@ -4,7 +4,7 @@
* *
* Debugging and logging component for WinCE (body). * Debugging and logging component for WinCE (body).
* *
* Copyright (C) 1996-2019 by * Copyright (C) 1996-2020 by
* David Turner, Robert Wilhelm, and Werner Lemberg. * David Turner, Robert Wilhelm, and Werner Lemberg.
* *
* This file is part of the FreeType project, and may only be used, * This file is part of the FreeType project, and may only be used,

View File

@ -21,7 +21,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -41,7 +41,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -61,7 +61,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -81,7 +81,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -101,7 +101,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -121,7 +121,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -141,7 +141,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101MT.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetypeMT.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -161,7 +161,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101MT.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetypeMT.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -181,7 +181,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101MT.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetypeMT.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -201,7 +201,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101MT.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetypeMT.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -221,7 +221,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101MT.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetypeMT.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -241,7 +241,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101MT.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetypeMT.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -261,7 +261,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101ST.lib" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetypeST.lib" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -281,7 +281,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101ST.lib" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetypeST.lib" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -301,7 +301,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101ST.lib" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetypeST.lib" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -321,7 +321,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101ST.lib" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetypeST.lib" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -341,7 +341,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101ST.lib" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetypeST.lib" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -361,7 +361,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101ST.lib" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetypeST.lib" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -381,7 +381,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -401,7 +401,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -421,7 +421,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -441,7 +441,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -461,7 +461,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -481,7 +481,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -501,7 +501,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101ST_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetypeST_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -521,7 +521,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101ST_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetypeST_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -541,7 +541,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101ST_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetypeST_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -561,7 +561,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101ST_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetypeST_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -581,7 +581,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101ST_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetypeST_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -601,7 +601,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101ST_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetypeST_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -621,7 +621,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101MT_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetypeMT_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -641,7 +641,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101MT_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetypeMT_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -661,7 +661,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101MT_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetypeMT_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -681,7 +681,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101MT_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetypeMT_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -701,7 +701,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101MT_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetypeMT_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -721,7 +721,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101MT_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetypeMT_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -741,7 +741,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101MT.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetypeMT.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -758,7 +758,7 @@
<Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" /> <Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2101MT_D.lib" SuppressStartupBanner="true" /> <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetypeMT_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" /> <Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" /> <Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" /> <Tool Name="VCBscMakeTool" />
@ -868,6 +868,10 @@
<File RelativePath="..\..\..\include\freetype\config\ftstdlib.h"> <File RelativePath="..\..\..\include\freetype\config\ftstdlib.h">
</File> </File>
</Filter> </Filter>
<Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx">
<File RelativePath="..\..\..\src\base\ftver.rc">
</File>
</Filter>
</Files> </Files>
<Globals> <Globals>
</Globals> </Globals>

View File

@ -21,14 +21,14 @@ the following targets:
<li>PPC/SP WM6 (Windows Mobile 6)</li> <li>PPC/SP WM6 (Windows Mobile 6)</li>
</ul> </ul>
It compiles the following libraries from the FreeType 2.10.1 sources:</p> It compiles the following libraries from the FreeType 2.10.2 sources:</p>
<ul> <ul>
<pre> <pre>
freetype2101.lib - release build; single threaded freetype.lib - release build; single threaded
freetype2101_D.lib - debug build; single threaded freetype_D.lib - debug build; single threaded
freetype2101MT.lib - release build; multi-threaded freetypeMT.lib - release build; multi-threaded
freetype2101MT_D.lib - debug build; multi-threaded</pre> freetypeMT_D.lib - debug build; multi-threaded</pre>
</ul> </ul>
<p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP <p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP

View File

@ -88,7 +88,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetype.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -177,7 +177,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetype.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -266,7 +266,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetype.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -355,7 +355,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetype.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -444,7 +444,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetype.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -533,7 +533,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetype.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -621,7 +621,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101MT.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetypeMT.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -709,7 +709,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101MT.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetypeMT.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -797,7 +797,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101MT.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetypeMT.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -885,7 +885,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101MT.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetypeMT.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -973,7 +973,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101MT.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetypeMT.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -1061,7 +1061,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101MT.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetypeMT.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -1149,7 +1149,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101ST.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetypeST.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -1236,7 +1236,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101ST.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetypeST.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -1323,7 +1323,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101ST.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetypeST.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -1410,7 +1410,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101ST.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetypeST.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -1497,7 +1497,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101ST.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetypeST.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -1584,7 +1584,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101ST.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetypeST.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -1668,7 +1668,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101_D.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetype_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -1753,7 +1753,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101_D.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetype_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -1838,7 +1838,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101_D.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetype_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -1923,7 +1923,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101_D.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetype_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -2008,7 +2008,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101_D.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetype_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -2093,7 +2093,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101_D.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetype_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -2178,7 +2178,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101ST_D.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetypeST_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -2263,7 +2263,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101ST_D.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetypeST_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -2348,7 +2348,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101ST_D.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetypeST_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -2433,7 +2433,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101ST_D.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetypeST_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -2518,7 +2518,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101ST_D.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetypeST_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -2603,7 +2603,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101ST_D.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetypeST_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -2689,7 +2689,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101MT_D.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetypeMT_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -2775,7 +2775,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101MT_D.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetypeMT_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -2861,7 +2861,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101MT_D.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetypeMT_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -2947,7 +2947,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101MT_D.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetypeMT_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -3033,7 +3033,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101MT_D.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetypeMT_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -3119,7 +3119,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101MT_D.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetypeMT_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -3205,7 +3205,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101MT.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetypeMT.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -3279,7 +3279,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2101MT_D.lib" OutputFile="..\..\..\objs\wince\vc2008-ce\freetypeMT_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -3502,6 +3502,15 @@
> >
</File> </File>
</Filter> </Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
>
<File
RelativePath="..\..\..\src\base\ftver.rc"
>
</File>
</Filter>
</Files> </Files>
<Globals> <Globals>
</Globals> </Globals>

View File

@ -21,14 +21,14 @@ the following targets:
<li>PPC/SP WM6 (Windows Mobile 6)</li> <li>PPC/SP WM6 (Windows Mobile 6)</li>
</ul> </ul>
It compiles the following libraries from the FreeType 2.10.1 sources:</p> It compiles the following libraries from the FreeType 2.10.2 sources:</p>
<ul> <ul>
<pre> <pre>
freetype2101.lib - release build; single threaded freetype.lib - release build; single threaded
freetype2101_D.lib - debug build; single threaded freetype_D.lib - debug build; single threaded
freetype2101MT.lib - release build; multi-threaded freetypeMT.lib - release build; multi-threaded
freetype2101MT_D.lib - debug build; multi-threaded</pre> freetypeMT_D.lib - debug build; multi-threaded</pre>
</ul> </ul>
<p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP <p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -4,7 +4,7 @@
* *
* Debugging and logging component for Win32 (body). * Debugging and logging component for Win32 (body).
* *
* Copyright (C) 1996-2019 by * Copyright (C) 1996-2020 by
* David Turner, Robert Wilhelm, and Werner Lemberg. * David Turner, Robert Wilhelm, and Werner Lemberg.
* *
* This file is part of the FreeType project, and may only be used, * This file is part of the FreeType project, and may only be used,

View File

@ -12,7 +12,7 @@
<p>This directory contains solution and project files for <p>This directory contains solution and project files for
Visual&nbsp;C++&nbsp;2010 or newer, named <tt>freetype.sln</tt>, Visual&nbsp;C++&nbsp;2010 or newer, named <tt>freetype.sln</tt>,
and <tt>freetype.vcxproj</tt>. It compiles the following libraries and <tt>freetype.vcxproj</tt>. It compiles the following libraries
from the FreeType 2.10.1 sources:</p> from the FreeType 2.10.2 sources:</p>
<ul> <ul>
<li>freetype.dll using 'Release' or 'Debug' configurations</li> <li>freetype.dll using 'Release' or 'Debug' configurations</li>

View File

@ -12,7 +12,7 @@
<p>This directory contains project files <tt>freetype.dsp</tt> for <p>This directory contains project files <tt>freetype.dsp</tt> for
Visual C++ 6.0, and <tt>freetype.vcproj</tt> for Visual C++ 2002 Visual C++ 6.0, and <tt>freetype.vcproj</tt> for Visual C++ 2002
through 2008, which you might need to upgrade automatically. through 2008, which you might need to upgrade automatically.
It compiles the following libraries from the FreeType 2.10.1 sources:</p> It compiles the following libraries from the FreeType 2.10.2 sources:</p>
<ul> <ul>
<li>freetype.dll using 'Release' or 'Debug' configurations</li> <li>freetype.dll using 'Release' or 'Debug' configurations</li>

View File

@ -54,7 +54,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo # ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2101.lib" # ADD LIB32 /nologo /out:"..\..\..\objs\freetype.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Debug" !ELSEIF "$(CFG)" == "freetype - Win32 Debug"
@ -78,7 +78,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo # ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2101_D.lib" # ADD LIB32 /nologo /out:"..\..\..\objs\freetype_D.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded"
@ -102,8 +102,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"lib\freetype2101_D.lib" # ADD BASE LIB32 /nologo /out:"lib\freetype_D.lib"
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2101MT_D.lib" # ADD LIB32 /nologo /out:"..\..\..\objs\freetypeMT_D.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded" !ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded"
@ -126,8 +126,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"lib\freetype2101.lib" # ADD BASE LIB32 /nologo /out:"lib\freetype.lib"
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2101MT.lib" # ADD LIB32 /nologo /out:"..\..\..\objs\freetypeMT.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded" !ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded"
@ -151,8 +151,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2101.lib" # ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype.lib"
# ADD LIB32 /out:"..\..\..\objs\freetype2101ST.lib" # ADD LIB32 /out:"..\..\..\objs\freetypeST.lib"
# SUBTRACT LIB32 /nologo # SUBTRACT LIB32 /nologo
!ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded"
@ -177,8 +177,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2101_D.lib" # ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype_D.lib"
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2101ST_D.lib" # ADD LIB32 /nologo /out:"..\..\..\objs\freetypeST_D.lib"
!ENDIF !ENDIF
@ -379,5 +379,13 @@ SOURCE=..\..\..\include\freetype\config\ftoption.h
SOURCE=..\..\..\include\freetype\config\ftstdlib.h SOURCE=..\..\..\include\freetype\config\ftstdlib.h
# End Source File # End Source File
# End Group # End Group
# Begin Group "Resource Files"
# PROP Default_Filter "rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
# Begin Source File
SOURCE=..\..\..\src\base\ftver.rc
# End Source File
# End Group
# End Target # End Target
# End Project # End Project

View File

@ -87,7 +87,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101.lib" OutputFile="..\..\..\objs\freetype.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -162,7 +162,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101MT.lib" OutputFile="..\..\..\objs\freetypeMT.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -237,7 +237,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101ST.lib" OutputFile="..\..\..\objs\freetypeST.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -309,7 +309,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101_D.lib" OutputFile="..\..\..\objs\freetype_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -382,7 +382,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101ST_D.lib" OutputFile="..\..\..\objs\freetypeST_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -456,7 +456,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101MT_D.lib" OutputFile="..\..\..\objs\freetypeMT_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -534,7 +534,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101.lib" OutputFile="..\..\..\objs\freetype.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -619,7 +619,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101MT.lib" OutputFile="..\..\..\objs\freetypeMT.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -704,7 +704,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101ST.lib" OutputFile="..\..\..\objs\freetypeST.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -785,7 +785,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101_D.lib" OutputFile="..\..\..\objs\freetype_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -867,7 +867,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101ST_D.lib" OutputFile="..\..\..\objs\freetypeST_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -950,7 +950,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101MT_D.lib" OutputFile="..\..\..\objs\freetypeMT_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -1036,7 +1036,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101.lib" OutputFile="..\..\..\objs\freetype.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -1121,7 +1121,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101MT.lib" OutputFile="..\..\..\objs\freetypeMT.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -1206,7 +1206,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101ST.lib" OutputFile="..\..\..\objs\freetypeST.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -1287,7 +1287,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101_D.lib" OutputFile="..\..\..\objs\freetype_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -1369,7 +1369,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101ST_D.lib" OutputFile="..\..\..\objs\freetypeST_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -1452,7 +1452,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101MT_D.lib" OutputFile="..\..\..\objs\freetypeMT_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -1538,7 +1538,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101.lib" OutputFile="..\..\..\objs\freetype.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -1623,7 +1623,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101MT.lib" OutputFile="..\..\..\objs\freetypeMT.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -1708,7 +1708,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101ST.lib" OutputFile="..\..\..\objs\freetypeST.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -1789,7 +1789,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101_D.lib" OutputFile="..\..\..\objs\freetype_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -1871,7 +1871,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101ST_D.lib" OutputFile="..\..\..\objs\freetypeST_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -1954,7 +1954,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101MT_D.lib" OutputFile="..\..\..\objs\freetypeMT_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -2040,7 +2040,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101.lib" OutputFile="..\..\..\objs\freetype.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -2125,7 +2125,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101MT.lib" OutputFile="..\..\..\objs\freetypeMT.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -2210,7 +2210,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101ST.lib" OutputFile="..\..\..\objs\freetypeST.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -2291,7 +2291,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101_D.lib" OutputFile="..\..\..\objs\freetype_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -2373,7 +2373,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101ST_D.lib" OutputFile="..\..\..\objs\freetypeST_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -2456,7 +2456,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101MT_D.lib" OutputFile="..\..\..\objs\freetypeMT_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -2542,7 +2542,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101.lib" OutputFile="..\..\..\objs\freetype.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -2627,7 +2627,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101MT.lib" OutputFile="..\..\..\objs\freetypeMT.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -2712,7 +2712,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101ST.lib" OutputFile="..\..\..\objs\freetypeST.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -2793,7 +2793,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101_D.lib" OutputFile="..\..\..\objs\freetype_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -2875,7 +2875,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101ST_D.lib" OutputFile="..\..\..\objs\freetypeST_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -2958,7 +2958,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101MT_D.lib" OutputFile="..\..\..\objs\freetypeMT_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -3044,7 +3044,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101.lib" OutputFile="..\..\..\objs\freetype.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -3129,7 +3129,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101MT.lib" OutputFile="..\..\..\objs\freetypeMT.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -3214,7 +3214,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101ST.lib" OutputFile="..\..\..\objs\freetypeST.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -3295,7 +3295,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101_D.lib" OutputFile="..\..\..\objs\freetype_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -3377,7 +3377,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101ST_D.lib" OutputFile="..\..\..\objs\freetypeST_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -3460,7 +3460,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype2101MT_D.lib" OutputFile="..\..\..\objs\freetypeMT_D.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -3691,6 +3691,15 @@
> >
</File> </File>
</Filter> </Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
>
<File
RelativePath="..\..\..\src\base\ftver.rc"
>
</File>
</Filter>
</Files> </Files>
<Globals> <Globals>
</Globals> </Globals>

View File

@ -21,14 +21,14 @@ the following targets:
<li>PPC/SP WM6 (Windows Mobile 6)</li> <li>PPC/SP WM6 (Windows Mobile 6)</li>
</ul> </ul>
It compiles the following libraries from the FreeType 2.10.1 sources:</p> It compiles the following libraries from the FreeType 2.10.2 sources:</p>
<ul> <ul>
<pre> <pre>
freetype2101.lib - release build; single threaded freetype.lib - release build; single threaded
freetype2101_D.lib - debug build; single threaded freetype_D.lib - debug build; single threaded
freetype2101MT.lib - release build; multi-threaded freetypeMT.lib - release build; multi-threaded
freetype2101MT_D.lib - debug build; multi-threaded</pre> freetypeMT_D.lib - debug build; multi-threaded</pre>
</ul> </ul>
<p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP <p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -3,7 +3,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

View File

@ -5,7 +5,7 @@
# #
# Copyright (C) 1996-2019 by # Copyright (C) 1996-2020 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,

Some files were not shown because too many files have changed in this diff Show More