From ad20e6ba57fe2ae5d39c1fa4f3bef4723c097fe7 Mon Sep 17 00:00:00 2001 From: David Turner Date: Thu, 22 Sep 2005 20:37:51 +0000 Subject: [PATCH] * src/base/Jamfile: fixing broken Jamfile --- ChangeLog | 4 +++ src/base/Jamfile | 89 ++++++++++++++++++++++++------------------------ 2 files changed, 49 insertions(+), 44 deletions(-) diff --git a/ChangeLog b/ChangeLog index 95d619a12..9bad0e597 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-09-22 David Turner + + * src/base/Jamfile: fixing broken Jamfile + 2005-09-19 David Somers * freetype2/src/sfnt/ttload.c (sfnt_dir_check): Modified to allow a diff --git a/src/base/Jamfile b/src/base/Jamfile index afbecc701..b71dd08a0 100644 --- a/src/base/Jamfile +++ b/src/base/Jamfile @@ -1,44 +1,45 @@ -# FreeType 2 src/base Jamfile -# -# Copyright 2001, 2002, 2003, 2004, 2005 by -# David Turner, Robert Wilhelm, and Werner Lemberg. -# -# 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. - -SubDir FT2_TOP $(FT2_SRC_DIR) base ; - - -{ - local _sources ; - - if $(FT2_MULTI) - { - _sources = ftutil ftdbgmem ftstream ftcalc fttrigon ftgloadr ftoutln - ftobjs ftnames ftrfork ; - } - else - { - _sources = ftbase ; - } - - Library $(FT2_LIB) : $(_sources).c ; -} - -# Add the optional/replaceable files. -# -Library $(FT2_LIB) : ftsystem.c ftinit.c ftglyph.c ftmm.c ftbdf.c - ftbbox.c ftdebug.c ftxf86.c fttype1.c ftpfr.c - ftstroke.c ftwinfnt.c ftotval.c ftgxval.c ftbitmap.c ; - -# Add Macintosh-specific file to the library when necessary. -# -if $(MAC) -{ - Library $(FT2_LIB) : ftmac.c ; -} - -# end of src/base Jamfile +# FreeType 2 src/base Jamfile +# +# Copyright 2001, 2002, 2003, 2004, 2005 by +# David Turner, Robert Wilhelm, and Werner Lemberg. +# +# 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. + +SubDir FT2_TOP $(FT2_SRC_DIR) base ; + + +{ + local _sources ; + + if $(FT2_MULTI) + { + _sources = ftutil ftdbgmem ftstream ftcalc fttrigon ftgloadr ftoutln + ftobjs ftnames ftrfork ; + } + else + { + _sources = ftbase ; + } + + Library $(FT2_LIB) : $(_sources).c ; +} + +# Add the optional/replaceable files. +# +Library $(FT2_LIB) : ftsystem.c ftinit.c ftglyph.c ftmm.c ftbdf.c + ftbbox.c ftdebug.c ftxf86.c fttype1.c ftpfr.c + ftstroke.c ftwinfnt.c ftotval.c ftbitmap.c + ftsynth.c ; + +# Add Macintosh-specific file to the library when necessary. +# +if $(MAC) +{ + Library $(FT2_LIB) : ftmac.c ; +} + +# end of src/base Jamfile