From 1a7bb5c635f5c1a2b59b653e8151b04857f08925 Mon Sep 17 00:00:00 2001
From: Pixel <pixel@nobis-crew.org>
Date: Mon, 13 Apr 2009 13:26:39 -0700
Subject: Switching to Mesa-7.4

---
 Makefile                | 6 +++---
 src/generate-gl-glue.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index e184f79..58d500b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 SYSTEM=$(shell uname)
 ifeq ($(SYSTEM),Darwin)
 ARCH_FLAGS=
-LDFLAGS_MESA=-all_load ../Mesa-7.3/lib/libGLU.a ../Mesa-7.3/lib/libOSMesa.a
+LDFLAGS_MESA=-all_load ../Mesa-7.4/lib/libGLU.a ../Mesa-7.4/lib/libOSMesa.a
 CPPFLAGS_READLINE=
 LDFLAGS_READLINE=-lreadline -lncurses
 SHARED_FLAGS=-dynamiclib
@@ -13,7 +13,7 @@ LDFLAGS_GL = -L/usr/X11/lib -lGLU -lGL -X11 -dylib_file \
 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
 else
 ARCH_FLAGS=-march=i686 -m32
-LDFLAGS_MESA=-u gluNewTess -Wl,--whole-archive ../Mesa-7.3/lib/libGLU.a ../Mesa-7.3/lib/libOSMesa.a -Wl,--no-whole-archive
+LDFLAGS_MESA=-u gluNewTess -Wl,--whole-archive ../Mesa-7.4/lib/libGLU.a ../Mesa-7.4/lib/libOSMesa.a -Wl,--no-whole-archive
 CPPFLAGS_READLINE=-DREADLINE_STATIC
 LDFLAGS_READLINE=/usr/lib/libreadline.a /usr/lib/libncurses.a
 SHARED_FLAGS=-shared
@@ -32,7 +32,7 @@ INCLUDES = \
 -I../Baltisot/lib/lua/include -I../Baltisot/lib/lua/includes \
 -I../lua-modules/src \
 \
--I ../Mesa-7.3/include \
+-I ../Mesa-7.4/include \
 -I ../tinyxml \
 -I /usr/include/mysql \
 -I /usr/include/FTGL -I /usr/include/freetype2 \
diff --git a/src/generate-gl-glue.sh b/src/generate-gl-glue.sh
index 86988f6..97a4dd3 100755
--- a/src/generate-gl-glue.sh
+++ b/src/generate-gl-glue.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-base="/Users/pixel/sources/Mesa-7.2/include/GL"
+base=`pwd`/../Mesa-7.4/include/GL
 
 files="gl.h glu.h"
 
-- 
cgit v1.2.3