diff options
| author | Pixel <pixel@nobis-crew.org> | 2009-11-05 11:46:54 -0800 |
|---|---|---|
| committer | Pixel <pixel@nobis-crew.org> | 2009-11-05 11:46:54 -0800 |
| commit | a874ea534e7cda1189634fe5f3ab28ae9b8e529e (patch) | |
| tree | 691ef9806a848974fe5fd799ab1d0b9c5bc3f13e /Makefile | |
| parent | eed3ccd0e2bffb427c4e9e7fae9d92bd153ca0da (diff) | |
| parent | d3829c2102e2c92596857fe207509e92884e7ece (diff) | |
Merge branch 'master' of ssh+git://pixel@git.grumpycoder.net/pub/repo.git/lua-modules
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -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) @@ -224,13 +225,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 $@) |