Mercurial > emacs
changeset 56892:02d9436a8b32
(LIBS_CARBON): New define to specify libraries for
Carbon support.
(LD_SWITCH_SYSTEM_TEMACS): Don't link with unused libstdc++. Use
LIBS_CARBON.
| author | Steven Tamm <steventamm@mac.com> |
|---|---|
| date | Thu, 02 Sep 2004 17:02:11 +0000 |
| parents | 10705eddc995 |
| children | b3e23208cc2a |
| files | src/s/darwin.h |
| diffstat | 1 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/s/darwin.h Thu Sep 02 17:01:20 2004 +0000 +++ b/src/s/darwin.h Thu Sep 02 17:02:11 2004 +0000 @@ -243,11 +243,18 @@ specific headers. */ #define C_SWITCH_SYSTEM -fpascal-strings -fno-common -DMAC_OSX -I../mac/src -/* Link in the Carbon lib. The -headerpad option tells ld (see man - page) to leave room at the end of the header for adding load - commands. Needed for dumping. 0x690 is the total size of 30 - segment load commands (at 56 each). */ -#define LD_SWITCH_SYSTEM_TEMACS -prebind -framework Carbon -framework QuickTime -lstdc++ -Xlinker -headerpad -Xlinker 690 +/* Link in the Carbon lib. */ +#ifdef HAVE_CARBON +#define LIBS_CARBON -framework Carbon -framework QuickTime +#else +#define LIBS_CARBON -framework Carbon +#endif + +/* The -headerpad option tells ld (see man page) to leave room at the + end of the header for adding load commands. Needed for dumping. + 0x690 is the total size of 30 segment load commands (at 56 + each). */ +#define LD_SWITCH_SYSTEM_TEMACS -prebind LIBS_CARBON -Xlinker -headerpad -Xlinker 690 #define C_SWITCH_SYSTEM_TEMACS -Dtemacs