From: Vinson Lee <vlee@freedesktop.org>
Date: Tue, 19 Jun 2012 07:02:53 +0000 (-0700)
Subject: scons: Add glsl/glcpp to the include path.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=37d699a296ac1d63b9276224847df4b645b53fe2;p=mesa.git

scons: Add glsl/glcpp to the include path.

Fixes this build failure on Solaris.

  Compiling build/sunos-debug/glsl/glcpp/glcpp-lex.c ...
"src/glsl/glcpp/glcpp-lex.l", line 30: cannot find include file: "glcpp-parse.h"

Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index f8e872368c2..2fc57c6dd5f 100644
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -14,8 +14,8 @@ env.Prepend(CPPPATH = [
     '#src/glsl/glcpp',
 ])
 
-# Make glcpp/glcpp-parse.h and glsl_parser.h reacheable from the include path
-env.Append(CPPPATH = [Dir('.').abspath])
+# Make glcpp-parse.h and glsl_parser.h reachable from the include path.
+env.Append(CPPPATH = [Dir('.').abspath, Dir('glcpp').abspath])
 
 env.Append(YACCFLAGS = '-d')