From d3829c2102e2c92596857fe207509e92884e7ece Mon Sep 17 00:00:00 2001 From: Pixel Date: Tue, 20 Oct 2009 12:30:17 -0700 Subject: Removing arch flags from the compilation flags for darwin. --- Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index e7504fc..10086ed 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ SYSTEM=$(shell uname) ifeq ($(SYSTEM),Darwin) -ARCH_FLAGS= +ARCH_FLAGS=-arch i386 -arch x86_64 -arch ppc SHARED_FLAGS=-dynamiclib SHARED_EXT=dylib SQL_LIBS=/sw/lib/mysql/libmysqlclient.a -lz @@ -41,7 +41,8 @@ INCLUDES = \ HAVES = -DHAVE_VSSCANF -DHAVE_LIBJPEG -DHAVE_FCNTL -DHAVE_MYSQL -DHAVE_UNISTD_H -DHAVE_FORK -DHAVE_PIPE -DHAVE_FSYNC -DHAVE_MALLOC_H -DHAVE_ASPRINTF -DHAVE_BYTESWAP_H -CPPFLAGS += $(INCLUDES) -O4 -fexceptions -DSTDC_HEADERS -DREADLINE_STATIC -DHOOK_STDS -DWORDS_LITTLEENDIAN $(ARCH_FLAGS) $(HAVES) -DUSE_OSMESA +CPPFLAGS_NO_ARCH += $(INCLUDES) -O4 -fexceptions -DSTDC_HEADERS -DREADLINE_STATIC -DHOOK_STDS -DWORDS_LITTLEENDIAN $(HAVES) -DUSE_OSMESA +CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS) LDFLAGS += $(ARCH_FLAGS) $(SHARED_FLAGS) -L/usr/lib/oracle/11.1.0.1/client/lib -L/usr/X11/lib -L/sw/lib -L/usr/local/instantclient ./lua-interface.$(SHARED_EXT) @@ -223,13 +224,13 @@ clean: rm -f *.o *.dep *.so *.dylib %.dep : %.c - $(CC) $(CPPFLAGS) -M -MF $@ $< + $(CC) $(CPPFLAGS_NO_ARCH) -M -MF $@ $< %.dep : %.cpp - $(CXX) $(CPPFLAGS) -M -MF $@ $< + $(CXX) $(CPPFLAGS_NO_ARCH) -M -MF $@ $< %.dep : %.cc - $(CXX) $(CPPFLAGS) -M -MF $@ $< + $(CXX) $(CPPFLAGS_NO_ARCH) -M -MF $@ $< %.c : %.clua bin2c $< $@ $(basename $@) -- cgit v1.2.3