summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy C. Reed <reed@reedmedia.net>2006-02-22 02:47:00 +0000
committerJeremy C. Reed <reed@reedmedia.net>2006-02-22 02:47:00 +0000
commit43fbcc28c960ce5abe1d3223441c3dc5a10cde27 (patch)
treed8aa1915d8a788a720994728ad68f1f73aa5bfd2
parentcfdacab33a62b47f22bb54683e3ca20ec9824864 (diff)
Update to build against Mesa HEAD. (Thank you Felix for feedback on xorg
list.)
-rw-r--r--ChangeLog7
-rw-r--r--GL/mesa/shader/slang/Makefile.am2
-rwxr-xr-xGL/symlink-mesa.sh4
3 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6ab2bed18..085e6a298 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-21 Jeremy C. Reed <reed@reedmedia.net>
+
+ * GL/mesa/shader/slang/Makefile.am:
+ * GL/symlink-mesa.sh:
+
+ Update to build against Mesa HEAD.
+
2006-02-20 Ian Romanick <idr@us.ibm.com>
* hw/xfree86/os-support/bus/Pci.c: (handlePciBIOS), (readPciBios),
diff --git a/GL/mesa/shader/slang/Makefile.am b/GL/mesa/shader/slang/Makefile.am
index ccd3799a2..d93e37e78 100644
--- a/GL/mesa/shader/slang/Makefile.am
+++ b/GL/mesa/shader/slang/Makefile.am
@@ -27,7 +27,9 @@ nodist_libslang_la_SOURCES = slang_assemble_assignment.c \
slang_compile_struct.c \
slang_compile_variable.c \
slang_execute.c \
+ slang_export.c \
slang_library_noise.c \
+ slang_link.c \
slang_preprocess.c \
slang_storage.c \
slang_utility.c
diff --git a/GL/symlink-mesa.sh b/GL/symlink-mesa.sh
index fe5e4f96a..829e8aa99 100755
--- a/GL/symlink-mesa.sh
+++ b/GL/symlink-mesa.sh
@@ -432,8 +432,12 @@ symlink_mesa_shader_slang() {
action slang_compile_variable.h
action slang_execute.c
action slang_execute.h
+ action slang_export.c
+ action slang_export.h
action slang_library_noise.c
action slang_library_noise.h
+ action slang_link.c
+ action slang_link.h
action slang_mesa.h
action slang_preprocess.c
action slang_preprocess.h