svn merge ^/branches/released .

1 files changed, 16 insertions, 2 deletions

diff --git a/mesalib/src/glsl/SConscript b/mesalib/src/glsl/SConscript
index 930148ee8..4cc50484b 100644
--- a/mesalib/src/glsl/SConscript
+++ b/mesalib/src/glsl/SConscript
@@ -14,10 +14,16 @@ 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])

+

 env.Append(YACCFLAGS = '-d')

 

-parser_env = env.Clone();

-parser_env.Append(YACCFLAGS = ['--defines=src/glsl/glsl_parser.h', '-p', '_mesa_glsl_'])

+parser_env = env.Clone()

+parser_env.Append(YACCFLAGS = [

+    '--defines=%s' % File('glsl_parser.h').abspath,

+    '-p', '_mesa_glsl_',

+])

 

 glcpp_lexer = env.CFile('glcpp/glcpp-lex.c', 'glcpp/glcpp-lex.l')

 glcpp_parser = env.CFile('glcpp/glcpp-parse.c', 'glcpp/glcpp-parse.y')

@@ -107,6 +113,10 @@ else:
                             '#src/mesa/program/symbol_table.c'],

     )

 

+    # SCons builtin dependency scanner doesn't detect that glsl_lexer.ll

+    # depends on glsl_parser.h

+    env.Depends(builtin_compiler, glsl_parser)

+

     builtin_glsl_function = env.CodeGenerate(

         target = 'builtin_function.cpp',

         script = 'builtins/tools/generate_builtins.py',

@@ -129,6 +139,10 @@ glsl = env.ConvenienceLibrary(
     source = sources,

 )

 

+# SCons builtin dependency scanner doesn't detect that glsl_lexer.ll depends on

+# glsl_parser.h

+env.Depends(glsl, glsl_parser)

+

 Export('glsl')

 

 # FIXME: We can't build the programs because there's a cyclic dependency between tis directory and src/mesa