Attachment 69588 Details for Bug 56787 – Fix for this bug

Fix for this bug

file_56787.txt (text/plain), 1.06 KB, created by Darren Salt on 2012-11-05 22:41:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Salt

Created: 2012-11-05 22:41:16 UTC

Size: 1.06 KB

patch

obsolete

>From 4a685ad9cdac3e6aa1b7a3f79d2d77ec6834e695 Mon Sep 17 00:00:00 2001
>From: Darren Salt <devspam@moreofthesa.me.uk>
>Date: Mon, 5 Nov 2012 21:26:47 +0000
>Subject: [PATCH] Fix use of glsl_parser.{cc,h} where source dir != build dir.
>
>---
> src/glsl/builtin_compiler/Makefile.am |    3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/src/glsl/builtin_compiler/Makefile.am b/src/glsl/builtin_compiler/Makefile.am
>index 72032b5..d6f85a7 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 \
>-- 
>1.7.10.4
>

Actions: View

Attachments on bug 56787: 69588

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.