Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged in FreeType 2.1.2 -> 2.1.3 differences. Resolved conflicts. 

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2041 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2002-11-20 21:40:01 +00:00
parent 389d57611d
commit fbd28219aa
8 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Jamrules
View File

@ -1425,6 +1425,27 @@ FT2_SRC = [ FDirName $(OBOS_TOP) src libs freetype2 ] ;
FT2_LIB = freetype ;
FT2_COMPONENTS ?= gzip # support for gzip-compressed files.
autohint # auto-hinter
base # base component (public APIs)
bdf # BDF font driver
cache # cache sub-system
cff # CFF/CEF font driver
cid # Postscript CID-keyed font driver
pcf # PCF font driver
pfr # PFR/TrueDoc font driver
psaux # Common Postscript routines module
pshinter # Postscript hinter module
psnames # Postscript names handling
raster # Monochrome rasterizer
smooth # Anti-aliased rasterizer
sfnt # SFNT-based format support routines
truetype # TrueType font driver
type1 # Postscript Type 1 font driver
type42 # Postscript Type 42 (embedded TrueType) driver
winfonts # Windows FON/FNT font driver
;
rule UseFreeTypeHeaders
{
SubDirHdrs $(FT2_INCLUDE) ;

29
src/libs/freetype2/Jamfile
View File

@ -3,35 +3,16 @@
SubDir OBOS_TOP src libs freetype2 ;
# We need to add "freetype/src" to the current include path in order to
# compile any part of FreeType 2.
#
# SubDirHdrs [ FT2_SubDir src ] ;
# The file <freetype/internal/internal.h> is used to define macros that are
# later used in #include statements. It needs to be parsed in order to
# record these definitions.
#
# HDRMACRO [ FT2_SubDir include internal internal.h ] ;
# HDRMACRO [ FT2_SubDir $(FT2_INCLUDE_DIR) internal internal.h ] ;
SubInclude OBOS_TOP src libs freetype2 autohint ;
SubInclude OBOS_TOP src libs freetype2 base ;
SubInclude OBOS_TOP src libs freetype2 bdf ;
SubInclude OBOS_TOP src libs freetype2 cache ;
SubInclude OBOS_TOP src libs freetype2 cff ;
SubInclude OBOS_TOP src libs freetype2 cid ;
SubInclude OBOS_TOP src libs freetype2 pcf ;
SubInclude OBOS_TOP src libs freetype2 pfr ;
SubInclude OBOS_TOP src libs freetype2 psaux ;
SubInclude OBOS_TOP src libs freetype2 pshinter ;
SubInclude OBOS_TOP src libs freetype2 psnames ;
SubInclude OBOS_TOP src libs freetype2 raster ;
SubInclude OBOS_TOP src libs freetype2 sfnt ;
SubInclude OBOS_TOP src libs freetype2 smooth ;
SubInclude OBOS_TOP src libs freetype2 truetype ;
SubInclude OBOS_TOP src libs freetype2 type1 ;
SubInclude OBOS_TOP src libs freetype2 type42 ;
SubInclude OBOS_TOP src libs freetype2 winfonts ;
for xx in $(FT2_COMPONENTS)
{
SubInclude OBOS_TOP src libs freetype2 $(xx) ;
}
SubDir OBOS_TOP src libs freetype2 ;

2
src/libs/freetype2/base/Jamfile
View File

@ -24,7 +24,7 @@ UseFreeTypeHeaders ;
# Add the optional/replaceable files.
#
FT2_Library $(FT2_LIB) : ftsystem.c ftinit.c ftglyph.c ftmm.c ftbdf.c
ftbbox.c ftdebug.c ftxf86.c fttype1.c ;
ftbbox.c ftdebug.c ftxf86.c fttype1.c ftpfr.c ;
# Add Macintosh-specific file to the library when necessary.
#

2
src/libs/freetype2/cff/Jamfile
View File

@ -10,7 +10,7 @@ UseFreeTypeHeaders ;
if $(FT2_MULTI)
{
_sources = cffdrivr cffgload cffload cffobjs cffparse ;
_sources = cffdrivr cffgload cffload cffobjs cffparse cffcmap ;
}
else
{

6
src/libs/freetype2/gzip/Jamfile
View File

@ -1,8 +1,10 @@
# FreeType 2 src/gzip Jamfile (c) 2001 David Turner
#
SubDir FT2_TOP $(FT2_SRC_DIR) gzip ;
SubDir OBOS_TOP src libs freetype2 gzip ;
Library $(FT2_LIB) : ftgzip.c ;
UseFreeTypeHeaders ;
FT2_Library $(FT2_LIB) : ftgzip.c ;
# end of src/pcf Jamfile

2
src/libs/freetype2/pfr/Jamfile
View File

@ -10,7 +10,7 @@ UseFreeTypeHeaders ;
if $(FT2_MULTI)
{
_sources = pfrdrivr pfrgload pfrload pfrobjs pfrcmap ;
_sources = pfrdrivr pfrgload pfrload pfrobjs pfrcmap pfrsbit ;
}
else
{

2
src/libs/freetype2/pshinter/Jamfile
View File

@ -10,7 +10,7 @@ UseFreeTypeHeaders ;
if $(FT2_MULTI)
{
_sources = pshrec pshglob pshalgo1 pshalgo2 pshmod ;
_sources = pshrec pshglob pshalgo1 pshalgo2 pshalgo3 pshmod ;
}
else
{

2
src/libs/freetype2/psnames/Jamfile
View File

@ -7,7 +7,7 @@ UseFreeTypeHeaders ;
{
local _sources ;
if $(FT2_MULTI)
{
_sources = psmodule ;