diff options
| author | Darren Salt <[email protected]> | 2012-11-05 21:26:47 +0000 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2012-11-09 16:56:35 -0800 |
| commit | d2a6dd9a953c08c427f0eeeed1c7b73f8e641590 (patch) | |
| tree | a7484084a12e8f3d9b5db383959e5f2bc961a62e /src/glsl | |
| parent | 2951a9dd51910461ddc736d791584369b06e3d0b (diff) | |
Fix use of glsl_parser.{cc,h} where source dir != build dir.
Fixes a regression caused by commit 9948a3365.
https://bugs.freedesktop.org/show_bug.cgi?id=56787
https://bugs.freedesktop.org/show_bug.cgi?id=56685
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/builtin_compiler/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/glsl/builtin_compiler/Makefile.am b/src/glsl/builtin_compiler/Makefile.am index 72032b524ad..d6f85a7f44e 100644 --- a/src/glsl/builtin_compiler/Makefile.am +++ b/src/glsl/builtin_compiler/Makefile.am @@ -35,6 +35,7 @@ AM_CFLAGS = \ -I $(top_srcdir)/src/mesa \ -I $(GLSL_SRCDIR) \ -I $(GLSL_SRCDIR)/glcpp \ + -I $(GLSL_BUILDDIR) \ $(DEFINES_FOR_BUILD) AM_CXXFLAGS = $(AM_CFLAGS) @@ -51,7 +52,7 @@ builtin_compiler_SOURCES = \ $(GLSL_SRCDIR)/glcpp/glcpp-parse.y \ $(LIBGLCPP_FILES) \ $(GLSL_SRCDIR)/glsl_lexer.ll \ - $(GLSL_SRCDIR)/glsl_parser.cc \ + $(GLSL_BUILDDIR)/glsl_parser.cc \ $(LIBGLSL_FILES) \ $(LIBGLSL_CXX_FILES) \ $(top_srcdir)/src/mesa/program/hash_table.c \ |