Disable Carbon framework dependency on 64bit ABI of Mac OS X 10.4.x
This commit is contained in:
parent
14ffe0911f
commit
86a3ee7613
|
@ -1,3 +1,10 @@
|
||||||
|
2007-03-26 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
||||||
|
|
||||||
|
* 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 <mpsuzuki@hiroshima-u.ac.jp>
|
2007-03-22 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
||||||
|
|
||||||
* builds/unix/ftsystem.c (FT_Stream_Open): Temporary fix to prevent
|
* builds/unix/ftsystem.c (FT_Stream_Open): Temporary fix to prevent
|
||||||
|
|
|
@ -100,7 +100,10 @@ FT_BEGIN_HEADER
|
||||||
/* */
|
/* */
|
||||||
#if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
|
#if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
|
||||||
( defined( __MWERKS__ ) && defined( macintosh ) )
|
( 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
|
#define DARWIN_NO_CARBON 1
|
||||||
#else
|
#else
|
||||||
#define FT_MACINTOSH 1
|
#define FT_MACINTOSH 1
|
||||||
|
|
|
@ -101,7 +101,14 @@ FT_BEGIN_HEADER
|
||||||
/* */
|
/* */
|
||||||
#if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
|
#if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
|
||||||
( defined( __MWERKS__ ) && defined( macintosh ) )
|
( 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
|
#define FT_MACINTOSH 1
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -126,7 +126,14 @@ FT_BEGIN_HEADER
|
||||||
/* */
|
/* */
|
||||||
#if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
|
#if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
|
||||||
( defined( __MWERKS__ ) && defined( macintosh ) )
|
( 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
|
#define FT_MACINTOSH 1
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue