diff --git a/ChangeLog b/ChangeLog index 6f06129bb..d8ce492ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-03-26 suzuki toshiya + + * builds/unix/ftconfig.in: disable Carbon framework dependency on + 64bit ABI on Mac OS X 10.4.x (ppc & i386), found by Sean McBride. + * builds/vms/ftconfig.h: Ditto. + * include/freetype/config/ftconfig.h: Ditto. + 2007-03-22 suzuki toshiya * builds/unix/ftsystem.c (FT_Stream_Open): Temporary fix to prevent diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in index b3c81b0ef..e773b415a 100644 --- a/builds/unix/ftconfig.in +++ b/builds/unix/ftconfig.in @@ -100,7 +100,10 @@ FT_BEGIN_HEADER /* */ #if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \ ( defined( __MWERKS__ ) && defined( macintosh ) ) -#if defined( __ppc64__ ) /* no Carbon for ppc64 */ + /* no Carbon frameworks for 64bit 10.4.x */ +#include "AvailabilityMacros.h" +#if defined( __LP64__ ) && \ + ( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 ) #define DARWIN_NO_CARBON 1 #else #define FT_MACINTOSH 1 diff --git a/builds/vms/ftconfig.h b/builds/vms/ftconfig.h index 81c9d4315..408b51fe9 100644 --- a/builds/vms/ftconfig.h +++ b/builds/vms/ftconfig.h @@ -101,7 +101,14 @@ FT_BEGIN_HEADER /* */ #if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \ ( defined( __MWERKS__ ) && defined( macintosh ) ) + /* no Carbon frameworks for 64bit 10.4.x */ +#include "AvailabilityMacros.h" +#if defined( __LP64__ ) && \ + ( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 ) +#define DARWIN_NO_CARBON 1 +#else #define FT_MACINTOSH 1 +#endif #endif diff --git a/include/freetype/config/ftconfig.h b/include/freetype/config/ftconfig.h index ef50a0ea1..74d64c9b1 100644 --- a/include/freetype/config/ftconfig.h +++ b/include/freetype/config/ftconfig.h @@ -126,7 +126,14 @@ FT_BEGIN_HEADER /* */ #if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \ ( defined( __MWERKS__ ) && defined( macintosh ) ) + /* no Carbon frameworks for 64bit 10.4.x */ +#include "AvailabilityMacros.h" +#if defined( __LP64__ ) && \ + ( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 ) +#define DARWIN_NO_CARBON 1 +#else #define FT_MACINTOSH 1 +#endif #endif