diff options
| author | marha <marha@users.sourceforge.net> | 2012-12-10 08:55:36 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-12-10 08:55:36 +0100 |
| commit | a0124a5e8e70979d2c24ef55285da989fdad766a (patch) | |
| tree | 5cea5c9804a8edf67bc7260e0851a20d21324547 /mesalib/src/glsl/Makefile.am | |
| parent | 514b4afb64ccbf8e954270105ed5064272a2be68 (diff) | |
| parent | 0328076efb5ff6e62152c09e38d0d11f7931d07b (diff) | |
| download | vcxsrv-a0124a5e8e70979d2c24ef55285da989fdad766a.tar.gz vcxsrv-a0124a5e8e70979d2c24ef55285da989fdad766a.tar.bz2 vcxsrv-a0124a5e8e70979d2c24ef55285da989fdad766a.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 mesa pixman git update 10 dec 2012
Conflicts:
fontconfig/src/fcxml.c
Diffstat (limited to 'mesalib/src/glsl/Makefile.am')
| -rw-r--r-- | mesalib/src/glsl/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesalib/src/glsl/Makefile.am b/mesalib/src/glsl/Makefile.am index ea7617685..aff1559e0 100644 --- a/mesalib/src/glsl/Makefile.am +++ b/mesalib/src/glsl/Makefile.am @@ -49,14 +49,16 @@ libglsl_la_LIBADD = glcpp/libglcpp.la libglsl_la_LDFLAGS = glsl_compiler_SOURCES = \ - $(top_srcdir)/src/mesa/program/hash_table.c \ + $(top_srcdir)/src/mesa/main/hash_table.c \ + $(top_srcdir)/src/mesa/program/prog_hash_table.c \ $(top_srcdir)/src/mesa/program/symbol_table.c \ $(GLSL_COMPILER_CXX_FILES) glsl_compiler_LDADD = libglsl.la glsl_test_SOURCES = \ - $(top_srcdir)/src/mesa/program/hash_table.c \ + $(top_srcdir)/src/mesa/main/hash_table.c \ + $(top_srcdir)/src/mesa/program/prog_hash_table.c \ $(top_srcdir)/src/mesa/program/symbol_table.c \ $(GLSL_SRCDIR)/standalone_scaffolding.cpp \ test.cpp \ |