summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2011-03-03 15:43:18 +0000
committerJosé Fonseca <[email protected]>2011-03-03 15:43:18 +0000
commitdbfbb8cf6da472e9000481ebd6a2a6b4e4845560 (patch)
treefd9724afc37a2c5ca7b0dfe7ea098ccafe70767d
parent54d8c5e3c2fc7db643a2bae61be203ab9cbb1efa (diff)
scons: Ensure generated headers are in the include path.
-rw-r--r--src/glsl/SConscript3
-rw-r--r--src/mesa/SConscript4
2 files changed, 7 insertions, 0 deletions
diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index 10abab6f945..c2e5d45ebad 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 acbf86ebd2d..ca36bf27f94 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',