Mesa (master): scons: Ensure generated headers are in the include path.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Thu Mar 3 15:43:37 UTC 2011
Module: Mesa
Branch: master
Commit: dbfbb8cf6da472e9000481ebd6a2a6b4e4845560
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dbfbb8cf6da472e9000481ebd6a2a6b4e4845560
Author: José Fonseca <jfonseca at vmware.com>
Date: Thu Mar 3 15:43:18 2011 +0000
scons: Ensure generated headers are in the include path.
---
src/glsl/SConscript | 3 +++
src/mesa/SConscript | 4 ++++
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index 10abab6..c2e5d45 100644
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -24,6 +24,9 @@ glcpp_parser = env.CFile('glcpp/glcpp-parse.c', 'glcpp/glcpp-parse.y')
glsl_lexer = parser_env.CXXFile('glsl_lexer.cpp', 'glsl_lexer.ll')
glsl_parser = parser_env.CXXFile('glsl_parser.cpp', 'glsl_parser.yy')
+# Make glcpp/glcpp-parse.h reacheable from the include path
+env.Append(CPPPATH = [glcpp_parser[0].dir.up()])
+
sources = [
glcpp_lexer,
glcpp_parser[0],
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index acbf86e..ca36bf2 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -218,6 +218,10 @@ env.Append(YACCFLAGS = '-d')
program_lex = env.CFile('program/lex.yy.c', 'program/program_lexer.l')
program_parse = env.CFile('program/program_parse.tab.c',
'program/program_parse.y')
+
+# Make program/program_parse.tab.h reacheable from the include path
+env.Append(CPPPATH = [program_parse[0].dir.up()])
+
program_sources = [
'program/arbprogparse.c',
'program/hash_table.c',
More information about the mesa-commit
mailing list