From fbd28219aa5014ebfa2a8f0664a977df3b406b55 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 20 Nov 2002 21:40:01 +0000 Subject: [PATCH] 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 --- Jamrules | 21 +++++++++++++++++++++ src/libs/freetype2/Jamfile | 29 +++++------------------------ src/libs/freetype2/base/Jamfile | 2 +- src/libs/freetype2/cff/Jamfile | 2 +- src/libs/freetype2/gzip/Jamfile | 6 ++++-- src/libs/freetype2/pfr/Jamfile | 2 +- src/libs/freetype2/pshinter/Jamfile | 2 +- src/libs/freetype2/psnames/Jamfile | 2 +- 8 files changed, 35 insertions(+), 31 deletions(-) diff --git a/Jamrules b/Jamrules index 43227c9ac4..78580b573b 100644 --- a/Jamrules +++ b/Jamrules @@ -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) ; diff --git a/src/libs/freetype2/Jamfile b/src/libs/freetype2/Jamfile index b9f7ca043f..b681e12113 100644 --- a/src/libs/freetype2/Jamfile +++ b/src/libs/freetype2/Jamfile @@ -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 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 ; diff --git a/src/libs/freetype2/base/Jamfile b/src/libs/freetype2/base/Jamfile index 0059e880a0..5e388e570b 100644 --- a/src/libs/freetype2/base/Jamfile +++ b/src/libs/freetype2/base/Jamfile @@ -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. # diff --git a/src/libs/freetype2/cff/Jamfile b/src/libs/freetype2/cff/Jamfile index 5622fbcb3e..e7aa1cb8df 100644 --- a/src/libs/freetype2/cff/Jamfile +++ b/src/libs/freetype2/cff/Jamfile @@ -10,7 +10,7 @@ UseFreeTypeHeaders ; if $(FT2_MULTI) { - _sources = cffdrivr cffgload cffload cffobjs cffparse ; + _sources = cffdrivr cffgload cffload cffobjs cffparse cffcmap ; } else { diff --git a/src/libs/freetype2/gzip/Jamfile b/src/libs/freetype2/gzip/Jamfile index e461cf1743..4f9db8a4b3 100644 --- a/src/libs/freetype2/gzip/Jamfile +++ b/src/libs/freetype2/gzip/Jamfile @@ -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 diff --git a/src/libs/freetype2/pfr/Jamfile b/src/libs/freetype2/pfr/Jamfile index 3ed7b01371..c18929f1e9 100644 --- a/src/libs/freetype2/pfr/Jamfile +++ b/src/libs/freetype2/pfr/Jamfile @@ -10,7 +10,7 @@ UseFreeTypeHeaders ; if $(FT2_MULTI) { - _sources = pfrdrivr pfrgload pfrload pfrobjs pfrcmap ; + _sources = pfrdrivr pfrgload pfrload pfrobjs pfrcmap pfrsbit ; } else { diff --git a/src/libs/freetype2/pshinter/Jamfile b/src/libs/freetype2/pshinter/Jamfile index bac0d85c6c..fc1fc1da85 100644 --- a/src/libs/freetype2/pshinter/Jamfile +++ b/src/libs/freetype2/pshinter/Jamfile @@ -10,7 +10,7 @@ UseFreeTypeHeaders ; if $(FT2_MULTI) { - _sources = pshrec pshglob pshalgo1 pshalgo2 pshmod ; + _sources = pshrec pshglob pshalgo1 pshalgo2 pshalgo3 pshmod ; } else { diff --git a/src/libs/freetype2/psnames/Jamfile b/src/libs/freetype2/psnames/Jamfile index 19c4fddf69..af651701b2 100644 --- a/src/libs/freetype2/psnames/Jamfile +++ b/src/libs/freetype2/psnames/Jamfile @@ -7,7 +7,7 @@ UseFreeTypeHeaders ; { local _sources ; - + if $(FT2_MULTI) { _sources = psmodule ;