From a23ccb8ac6c470d72eb3d081625926965d3a9f52 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 27 Feb 2006 00:08:02 +0000 Subject: updated for version 7.0208 --- src/Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 8ff3e3b2e6..66185ce02c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -354,7 +354,10 @@ CClink = $(CC) # DARWIN - detecting Mac OS X # Uncomment this line when you want to compile a Unix version of Vim on # Darwin. None of the Mac specific options or files will be used. +# You can also change the architecture supported, default is to test for both. #CONF_OPT_DARWIN = --disable-darwin +#CONF_OPT_DARWIN = --with-mac-arch=i386 +#CONF_OPT_DARWIN = --with-mac-arch=ppc # PERL # Uncomment this when you want to include the Perl interface. @@ -547,10 +550,6 @@ LINT_OPTIONS = -beprxzF #PROFILE_CFLAGS = -DEXITFREE #PROFILE_LIBS = -lccmalloc -# MAC OS X platform -MAC_OSX_ARCH = -arch ppc -#MAC_OSX_ARCH = -arch i386 - ##################################################### ### Specific systems, check if yours is listed! ### {{{ ##################################################### @@ -1201,11 +1200,11 @@ PHOTONGUI_BUNDLE = # CARBON GUI CARBONGUI_SRC = gui.c gui_mac.c CARBONGUI_OBJ = objects/gui.o objects/gui_mac.o objects/pty.o -CARBONGUI_DEFS = -DFEAT_GUI_MAC $(MAC_OSX_ARCH) -fno-common -fpascal-strings \ +CARBONGUI_DEFS = -DFEAT_GUI_MAC -fno-common -fpascal-strings \ -Wall -Wno-unknown-pragmas \ -mdynamic-no-pic -pipe CARBONGUI_IPATH = -I. -Iproto -CARBONGUI_LIBS_DIR = $(MAC_OSX_ARCH) +CARBONGUI_LIBS_DIR = CARBONGUI_LIBS1 = -framework Carbon CARBONGUI_LIBS2 = CARBONGUI_INSTALL = install_macosx -- cgit v1.2.3