From 60e83a1d5779fc016d641a4ad4b322dfd97d6d75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Suzuki=2C=20Toshiya=20=28=E9=88=B4=E6=9C=A8=E4=BF=8A?= =?UTF-8?q?=E5=93=89=29?= Date: Thu, 14 Feb 2008 02:55:16 +0000 Subject: [PATCH] * src/base/ftbase.c: is replaced by "ftmac.c" --- ChangeLog | 10 ++++++++++ builds/unix/configure.raw | 2 +- docs/INSTALL.MAC | 6 ++++++ src/base/ftbase.c | 2 +- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f7fb16c9..47473ead8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-02-14 suzuki toshiya + + * src/base/ftbase.c: is replaced by "ftmac.c" as other + inclusion styles. Now it always includes src/base/ftmac.c, + builds/mac/ftmac.c is never included in any configuration. + * builds/unix/configure.raw: Prints warning when configure is + executed with options to specify Carbon functionalities explicitly. + * docs/INSTALL.MAC: Note the legacy builds/mac/ftmac.c is not + included automatically and manual replacement is required. + 2008-02-11 Werner Lemberg * builds/modules.mk (CLOSE_MODULE, REMOVE_MODULE), builds/detect.mk diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index 8cc189f39..06be49a0d 100644 --- a/builds/unix/configure.raw +++ b/builds/unix/configure.raw @@ -484,7 +484,7 @@ case "$CFLAGS" in AC_MSG_WARN([ *** WARNING FSSpec/FSRef/QuickDraw/ATS options are explicitly given, - thus using legacy builds/mac/ftmac.c instead of src/base/ftmac.c. + thus it is recommended to replace src/base/ftmac.c by builds/mac/ftmac.c. ]) CFLAGS="$CFLAGS "'-I$(TOP_DIR)/builds/mac/' ;; diff --git a/docs/INSTALL.MAC b/docs/INSTALL.MAC index bc7f0e836..42bb0d863 100644 --- a/docs/INSTALL.MAC +++ b/docs/INSTALL.MAC @@ -1,6 +1,12 @@ Please follow the instructions in INSTALL.UNIX to install FreeType on Mac OS X. +Currently FreeType2 functions based on some deprecated Carbon APIs +return FT_Err_Unimplemented_Feature always, even if FreeType2 is +configured and built on the system that deprecated Carbon APIs are +available. To enable deprecated FreeType2 functions as far as possible, +replace src/base/ftmac.c by builds/mac/ftmac.c. + Starting with Mac OS X 10.5, gcc defaults the deployment target to 10.5. In previous versions of Mac OS X, this defaulted to 10.1. If you want your built binaries to run only on 10.5, this change diff --git a/src/base/ftbase.c b/src/base/ftbase.c index d176b8150..300e02d15 100644 --- a/src/base/ftbase.c +++ b/src/base/ftbase.c @@ -32,7 +32,7 @@ #include "ftutil.c" #if defined( __APPLE__ ) && !defined ( DARWIN_NO_CARBON ) -#include +#include "ftmac.c" #endif /* END */