summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2006-02-15 18:26:45 +0000
committerKristian Høgsberg <krh@redhat.com>2006-02-15 18:26:45 +0000
commit6ad4325b87889e1aada9333d750b7bb586c38b52 (patch)
tree113a9be7d47505aff776d6ea0557b0a0fccd8c29
parent50e2ff9a2500078ebbd833fddab0d93f3a50b6a6 (diff)
Update to build against mesa head.
-rw-r--r--ChangeLog6
-rw-r--r--GL/mesa/swrast/Makefile.am1
-rwxr-xr-xGL/symlink-mesa.sh2
3 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b61e7f135..3ab3ba9da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-15 Kristian Høgsberg <krh@redhat.com>
+
+ * GL/symlink-mesa.sh:
+ * GL/mesa/swrast/Makefile.am:
+ Update to build against Mesa trunk.
+
2006-02-14 Eric Anholt <anholt@FreeBSD.org>
* hw/kdrive/mga/mgadraw.c: (mgaDrawDisable):
diff --git a/GL/mesa/swrast/Makefile.am b/GL/mesa/swrast/Makefile.am
index 83457ad46..07f8885e0 100644
--- a/GL/mesa/swrast/Makefile.am
+++ b/GL/mesa/swrast/Makefile.am
@@ -20,6 +20,7 @@ nodist_libswrast_la_SOURCES = s_aaline.c \
s_aatriangle.c \
s_accum.c \
s_alpha.c \
+ s_arbshader.c \
s_atifragshader.c \
s_bitmap.c \
s_blend.c \
diff --git a/GL/symlink-mesa.sh b/GL/symlink-mesa.sh
index 9ddad244b..d31b6b0ca 100755
--- a/GL/symlink-mesa.sh
+++ b/GL/symlink-mesa.sh
@@ -254,6 +254,8 @@ symlink_mesa_swrast() {
action s_accum.h
action s_alpha.c
action s_alpha.h
+ action s_arbshader.c
+ action s_arbshader.h
action s_atifragshader.c
action s_atifragshader.h
action s_bitmap.c