diff --git a/ChangeLog b/ChangeLog index 7b07c41a8..3f16d8764 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-12-06 suzuki toshiya + + The documents and comments for Mac OS X are improved by Sean + McBride. + + * src/base/ftmac.c: Fix a comment. + * include/freetype/ftmac.h: Ditto. + * docs/INSTALL.MAC: Improve English and add comment on lowest + system version specified by MACOSX_DEPLOYMENT_TARGET. + 2007-12-04 Werner Lemberg * src/cff/cffload.c (cff_subfont_load): Don't use logical OR to diff --git a/docs/INSTALL.MAC b/docs/INSTALL.MAC index 91d8cf069..bc7f0e836 100644 --- a/docs/INSTALL.MAC +++ b/docs/INSTALL.MAC @@ -1,19 +1,26 @@ Please follow the instructions in INSTALL.UNIX to install FreeType on Mac OS X. -Since Mac OS X 10.5, when environment variable MACOSX_DEPLOYMENT_TARGET -is not given, Apple's diversion of gcc configures the conditional macros -to Mac OS X 10.5 and newer. If you want to use the built binaries on -older platforms, you must set the variable to the lowest system you care. -For example, if you are working on Bourne shell, +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 +does not concern you. If you want them to also run on older versions +of Mac OS X, then you must either set the MACOSX_DEPLOYMENT_TARGET +environment variable or pass -mmacosx-version-min to gcc. You should +specify the oldest version of Mac OS you want the code to run on. +For example, if you use Bourne shell: - export MACOSX_DEPLOYMENT_TARGET=10.0 + export MACOSX_DEPLOYMENT_TARGET=10.2 -or, if you are working on C shell, +or, if you use C shell: - setenv MACOSX_DEPLOYMENT_TARGET 10.0 + setenv MACOSX_DEPLOYMENT_TARGET 10.2 -makes gcc to configure the conditional macros to 10.0-capable values. +Alternatively, you could pass "-mmacosx-version-min=10.2" to gcc. +Here the number 10.2 is the lowest version that the built binaries +can run on. In the cases in above, the built binaries will run on +Mac OS X 10.2 and later, but _not_ earlier. If you want to run on +earlier, you have to set lower version, e.g. 10.0. For classic Mac OS (Mac OS 7, 8, 9) please refer to builds/mac/README. diff --git a/include/freetype/ftmac.h b/include/freetype/ftmac.h index 0355bb5a1..1752d132a 100644 --- a/include/freetype/ftmac.h +++ b/include/freetype/ftmac.h @@ -18,9 +18,9 @@ /***************************************************************************/ /* */ -/* NOTE: Include this file after and after the */ -/* Mac-specific header (or any other Mac header that */ -/* includes ); we use Handle type. */ +/* NOTE: Include this file after and after any */ +/* Mac-specific headers (because this header uses Mac types such as */ +/* Handle, FSSpec, FSRef, etc.) */ /* */ /***************************************************************************/ diff --git a/src/base/ftmac.c b/src/base/ftmac.c index fd8e19a79..a95b93aaf 100644 --- a/src/base/ftmac.c +++ b/src/base/ftmac.c @@ -77,7 +77,7 @@ #define OS_INLINE static __inline__ #endif -/* Some portable types are unavailable on legacy SDKs */ + /* The ResourceIndex type was only added in the 10.5 SDK */ #ifndef MAC_OS_X_VERSION_10_5 typedef short ResourceIndex; #endif