Mesa (master): scons: Add glsl/glcpp to the include path.
Vinson Lee
vlee at kemper.freedesktop.org
Sat Jun 23 20:41:04 UTC 2012
Module: Mesa
Branch: master
Commit: 37d699a296ac1d63b9276224847df4b645b53fe2
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=37d699a296ac1d63b9276224847df4b645b53fe2
Author: Vinson Lee <vlee at freedesktop.org>
Date: Tue Jun 19 00:02:53 2012 -0700
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 at freedesktop.org>
Reviewed-by: Brian Paul <brianp at vmware.com>
---
src/glsl/SConscript | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index f8e8723..2fc57c6 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')
More information about the mesa-commit
mailing list