From 13b0dd3ef60a30d77460dec44e755650745d9b50 Mon Sep 17 00:00:00 2001 From: layer <layer> Date: Wed, 12 Apr 2006 03:53:55 +0000 Subject: [PATCH] 2006-04-11 Duane Rettig <duane@gemini> --- ChangeLog.n | 6 +++++- Makefile.macosx | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog.n b/ChangeLog.n index 1a202347..177832d5 100644 --- a/ChangeLog.n +++ b/ChangeLog.n @@ -1,3 +1,7 @@ +2006-04-11 <duane@gemini> + + * Makefile.maxosx: Add mactel + 2006-04-06 <layer@HOBART64> * aclpc/acl-class.lisp: fix argument to GetWinMainArgs @@ -6032,4 +6036,4 @@ IGNORE JDI SPECIFIC CHANGES TO Makefile Lots of other stuff ******************************************************************************* -$Revision: 2.16 $ +$Revision: 2.17 $ diff --git a/Makefile.macosx b/Makefile.macosx index 39e74b45..61d80886 100644 --- a/Makefile.macosx +++ b/Makefile.macosx @@ -1,4 +1,4 @@ -# $Id: Makefile.macosx,v 2.5 2005/08/03 05:07:13 layer Exp $ +# $Id: Makefile.macosx,v 2.6 2006/04/12 03:53:55 layer Exp $ # # Makefile.macosx for CLIM 2.0 # @@ -30,9 +30,14 @@ ifeq ($(SIXTYFOURBIT),yes) CFLAGS= -arch ppc64 -DAcl64Bit MAKE_SHARED = sh ../src/bin/make_shared.mac64 else +ifeq ($(MACHINE),x86) +CFLAGS= +MAKE_SHARED = sh ../src/bin/make_shared.mac86 +else CFLAGS= MAKE_SHARED = sh ../src/bin/make_shared.mac endif +endif PICFLAGS = SHAREFLAGS = -- GitLab