scons: Use Flex and Bison to generate lexer/parser files.

This gets it building again here; I'll leave it up to the SCons
maintainers to make further improvements.
This commit is contained in:
Kenneth Graunke
2011-03-01 15:04:04 -08:00
parent 80ec97af79
commit 8be58df67a
2 changed files with 21 additions and 6 deletions

View File

@@ -11,18 +11,29 @@ env.Prepend(CPPPATH = [
'#src/mapi', '#src/mapi',
'#src/mesa', '#src/mesa',
'#src/glsl', '#src/glsl',
'#src/glsl/glcpp',
]) ])
env.Append(YACCFLAGS = '-d')
parser_env = env.Clone();
parser_env.Append(YACCFLAGS = ['--defines=src/glsl/glsl_parser.h', '-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')
glsl_lexer = parser_env.CXXFile('glsl_lexer.cpp', 'glsl_lexer.ll')
glsl_parser = parser_env.CXXFile('glsl_parser.cpp', 'glsl_parser.yy')
sources = [ sources = [
'glcpp/glcpp-lex.c', glcpp_lexer,
'glcpp/glcpp-parse.c', glcpp_parser[0],
'glcpp/pp.c', 'glcpp/pp.c',
'ast_expr.cpp', 'ast_expr.cpp',
'ast_function.cpp', 'ast_function.cpp',
'ast_to_hir.cpp', 'ast_to_hir.cpp',
'ast_type.cpp', 'ast_type.cpp',
'glsl_lexer.cpp', glsl_lexer,
'glsl_parser.cpp', glsl_parser[0],
'glsl_parser_extras.cpp', 'glsl_parser_extras.cpp',
'glsl_types.cpp', 'glsl_types.cpp',
'glsl_symbol_table.cpp', 'glsl_symbol_table.cpp',

View File

@@ -214,15 +214,17 @@ statetracker_sources = [
'state_tracker/st_texture.c', 'state_tracker/st_texture.c',
] ]
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')
program_sources = [ program_sources = [
'program/arbprogparse.c', 'program/arbprogparse.c',
'program/hash_table.c', 'program/hash_table.c',
'program/ir_to_mesa.cpp', 'program/ir_to_mesa.cpp',
'program/lex.yy.c',
'program/nvfragparse.c', 'program/nvfragparse.c',
'program/nvvertparse.c', 'program/nvvertparse.c',
'program/program.c', 'program/program.c',
'program/program_parse.tab.c',
'program/program_parse_extra.c', 'program/program_parse_extra.c',
'program/prog_cache.c', 'program/prog_cache.c',
'program/prog_execute.c', 'program/prog_execute.c',
@@ -237,6 +239,8 @@ program_sources = [
'program/programopt.c', 'program/programopt.c',
'program/sampler.cpp', 'program/sampler.cpp',
'program/symbol_table.c', 'program/symbol_table.c',
program_lex,
program_parse[0],
] ]
mesa_sources = ( mesa_sources = (