rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Fix the conditions for multi build on MacOS

This commit is contained in:
Suzuki, Toshiya (鈴木俊哉) 2008-09-30 00:59:55 +00:00
parent b4c810e2b4
commit c6bdee5f27
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-09-30 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
* src/base/Jamfile: Add target for multi build by jam on Mac OS X.
* src/base/ftobjs.c (FT_New_Face): Fix the condition to include
this function for MPW building. It is synchronized the condition
to include ftmac.c source into ftbase.c.
2008-09-22 Werner Lemberg <wl@gnu.org>
* src/cff/cffgload.c (CFF_Operator, cff_argument_counts,

7
src/base/Jamfile
View File

@ -46,5 +46,12 @@ if $(MAC)
{
Library $(FT2_LIB) : ftmac.c ;
}
else if $(OS) = MACOSX
{
if $(FT2_MULTI)
{
Library $(FT2_LIB) : ftmac.c ;
}
}
# end of src/base Jamfile

4
src/base/ftobjs.c
View File

@ -1117,7 +1117,7 @@
/* there's a Mac-specific extended implementation of FT_New_Face() */
/* in src/base/ftmac.c */
#ifndef FT_MACINTOSH
#if !defined( __APPLE__ ) || defined( DARWIN_NO_CARBON )
/* documentation is in freetype.h */
@ -1140,7 +1140,7 @@
return FT_Open_Face( library, &args, face_index, aface );
}
#endif /* !FT_MACINTOSH */
#endif /* defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) */
/* documentation is in freetype.h */