summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPixel <pixel@nobis-crew.org>2009-04-13 13:26:39 -0700
committerPixel <pixel@nobis-crew.org>2009-04-13 13:26:39 -0700
commit1a7bb5c635f5c1a2b59b653e8151b04857f08925 (patch)
tree5159cd32db6a1bf0cea2a950313988fb876dbf57 /Makefile
parentfeb84eae5b4ed3a3c66f1534b28eefd70e08075e (diff)
Switching to Mesa-7.4
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 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 \