From 15256486b01e45dc851d1dae5c7048f9d6f600fc Mon Sep 17 00:00:00 2001
From: Pixel <pixel@nobis-crew.org>
Date: Wed, 10 Dec 2008 11:31:16 -0800
Subject: Re-fixing issues from the MacOS X port.

---
 Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index f550d53..5d024ae 100644
--- a/Makefile
+++ b/Makefile
@@ -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
 
-- 
cgit v1.2.3