From 3da2bc1b23fb3d2eb4cbf99aaa5996fcc6e62c68 Mon Sep 17 00:00:00 2001
From: Pixel <pixel@nobis-crew.org>
Date: Fri, 15 May 2009 18:21:27 -0700
Subject: Bumping to Mesa 7.4.2, and adjusting compilation for Debian x86_64.

---
 Makefile | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 70c2646..17e1858 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,9 @@
 SYSTEM=$(shell uname)
+MACHINE=$(shell uname -m)
+DISTRIB=$(shell cat /etc/issue | cut -f 1 -d\ | head -1)
 ifeq ($(SYSTEM),Darwin)
 ARCH_FLAGS=
-LDFLAGS_MESA=-all_load ../Mesa-7.4/lib/libGLU.a ../Mesa-7.4/lib/libOSMesa.a
+LDFLAGS_MESA=-all_load ../Mesa-7.4.2/lib/libGLU.a ../Mesa-7.4.2/lib/libOSMesa.a
 CPPFLAGS_READLINE=
 LDFLAGS_READLINE=-lreadline -lncurses
 SHARED_FLAGS=-dynamiclib
@@ -14,9 +16,14 @@ LDFLAGS_GL = -L/usr/X11/lib -lGLU -lGL -X11 -dylib_file \
 else
 ARCH_FLAGS=-march=i686 -m32
 ASFLAGS=-march=i686 --32
-LDFLAGS_MESA=-u gluNewTess -Wl,--whole-archive ../Mesa-7.4/lib/libGLU.a ../Mesa-7.4/lib/libOSMesa.a -Wl,--no-whole-archive
+LDFLAGS_MESA=-u gluNewTess -Wl,--whole-archive ../Mesa-7.4.2/lib/libGLU.a ../Mesa-7.4.2/lib/libOSMesa.a -Wl,--no-whole-archive
 CPPFLAGS_READLINE=-DREADLINE_STATIC
 LDFLAGS_READLINE=/usr/lib/libreadline.a /usr/lib/libncurses.a
+ifeq ($(MACHINE),x86_64)
+ifeq ($(DISTRIB),Debian)
+LDFLAGS_READLINE=/usr/lib32/libreadline.a /usr/lib32/libncurses.a
+endif
+endif
 SHARED_FLAGS=-shared
 SHARED_EXT=so
 LD = g++ -m32
@@ -33,7 +40,7 @@ INCLUDES = \
 -I../Baltisot/lib/lua/include -I../Baltisot/lib/lua/includes \
 -I../lua-modules/src \
 \
--I ../Mesa-7.4/include \
+-I ../Mesa-7.4.2/include \
 -I ../tinyxml \
 -I /usr/include/mysql \
 -I /usr/include/FTGL -I /usr/include/freetype2 \
-- 
cgit v1.2.3