diff options
| author | Pixel <pixel@nobis-crew.org> | 2008-12-10 11:31:16 -0800 |
|---|---|---|
| committer | Pixel <pixel@nobis-crew.org> | 2008-12-10 11:31:16 -0800 |
| commit | 15256486b01e45dc851d1dae5c7048f9d6f600fc (patch) | |
| tree | d39ac7364e77b87798b0afda38b2108fb2071492 | |
| parent | 00ebf2f6e380d9e410bb37fe639de4559e0a2a2d (diff) | |
Re-fixing issues from the MacOS X port.
| -rw-r--r-- | Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -6,17 +6,19 @@ CPPFLAGS_READLINE= LDFLAGS_READLINE=-lreadline -lncurses SHARED_FLAGS=-dynamiclib SHARED_EXT=dylib +LIBS=-liconv +LD = g++ else -ARCH_FLAGS=-march=i686 +ARCH_FLAGS=-march=i686 -m32 LDFLAGS_MESA=-u gluNewTess -Wl,--whole-archive ../Mesa-7.2/lib/libGLU.a ../Mesa-7.2/lib/libOSMesa.a -Wl,--no-whole-archive CPPFLAGS_READLINE=-DREADLINE_STATIC LDFLAGS_READLINE=/usr/lib/libreadline.a /usr/lib/libncurses.a SHARED_FLAGS=-shared SHARED_EXT=so +LD = g++ -m32 endif CC = gcc CXX = g++ -LD = g++ STRIP = strip INCLUDES = \ @@ -34,7 +36,7 @@ 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 -LIBS = -lz -ldl -lpthread -liconv +LIBS += -lz -ldl -lpthread CPPFLAGS += $(INCLUDES) -g -DSTDC_HEADERS $(CPPFLAGS_READLINE) -DHOOK_STDS -fexceptions -DWORDS_LITTLEENDIAN -fexceptions $(ARCH_FLAGS) $(HAVES) -DUSE_MPQLIB |