shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

* Fix the conditions for multi build on MacOS

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,10 @@

+2008-09-30  suzuki toshiya  <[email protected]>

+

+	* 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  <[email protected]>

 	* src/cff/cffgload.c (CFF_Operator, cff_argument_counts,

--- a/src/base/Jamfile

+++ b/src/base/Jamfile

@@ -46,5 +46,12 @@

 {

   Library  $(FT2_LIB) : ftmac.c ;

 }

+else if $(OS) = MACOSX

+{

+  if $(FT2_MULTI)

+  {

+    Library  $(FT2_LIB) : ftmac.c ;

+  }

+}

 # end of src/base Jamfile

--- a/src/base/ftobjs.c

+++ b/src/base/ftobjs.c

@@ -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 */