Commit c6bdee5f27c4ba6a49d781e26ae686d3512e8f56
2008-09-30T00:59:55
* Fix the conditions for multi build on MacOS
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54
diff --git a/ChangeLog b/ChangeLog
index e0bd9d5..09486ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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,
diff --git a/src/base/Jamfile b/src/base/Jamfile
index e025769..3734a25 100644
--- a/src/base/Jamfile
+++ b/src/base/Jamfile
@@ -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
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 026691e..2b49b2f 100644
--- 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 */