diff --git a/ChangeLog b/ChangeLog index 488b54e3e..44bb1c945 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-03-15 Felix Kuehling + + * GL/mesa/shader/slang/Makefile.am: + * GL/symlink-mesa.sh: + Update to build against Mesa CVS HEAD. + 2006-03-15 Eric Anholt * exa/exa_migration.c: (exaMoveInPixmap): diff --git a/GL/mesa/shader/slang/Makefile.am b/GL/mesa/shader/slang/Makefile.am index b7305114a..4a00c9920 100644 --- a/GL/mesa/shader/slang/Makefile.am +++ b/GL/mesa/shader/slang/Makefile.am @@ -16,7 +16,8 @@ INCLUDES = -I@MESA_SOURCE@/include \ -I../.. \ -I$(top_srcdir)/hw/xfree86/os-support -nodist_libslang_la_SOURCES = slang_assemble_assignment.c \ +nodist_libslang_la_SOURCES = slang_analyse.c \ + slang_assemble_assignment.c \ slang_assemble.c \ slang_assemble_conditional.c \ slang_assemble_constructor.c \ @@ -29,6 +30,7 @@ nodist_libslang_la_SOURCES = slang_assemble_assignment.c \ slang_execute.c \ slang_execute_x86.c \ slang_export.c \ + slang_library_texsample.c \ slang_library_noise.c \ slang_link.c \ slang_preprocess.c \ diff --git a/GL/symlink-mesa.sh b/GL/symlink-mesa.sh index afd1f5501..ccaa2a947 100755 --- a/GL/symlink-mesa.sh +++ b/GL/symlink-mesa.sh @@ -412,6 +412,8 @@ symlink_mesa_shader_slang() { src_dir src/mesa/shader/slang dst_dir mesa/shader/slang + action slang_analyse.c + action slang_analyse.h action slang_assemble.c action slang_assemble.h action slang_assemble_assignment.c @@ -439,6 +441,8 @@ symlink_mesa_shader_slang() { action slang_export.h action slang_library_noise.c action slang_library_noise.h + action slang_library_texsample.c + action slang_library_texsample.h action slang_link.c action slang_link.h action slang_mesa.h