From e78ebbc5f9448d459b57884d90b0a6496294c1dd Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 15 Sep 2012 09:01:02 -0600 Subject: [PATCH] scons: add new -p (prefix) options for yacc These were recently added to the Makefiles. --- src/glsl/SConscript | 2 +- src/mesa/SConscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/glsl/SConscript b/src/glsl/SConscript index 0855c67bb4e..b034f3b06dc 100644 --- a/src/glsl/SConscript +++ b/src/glsl/SConscript @@ -17,7 +17,7 @@ env.Prepend(CPPPATH = [ # 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') +env.Append(YACCFLAGS = '-d -p "glcpp_parser_"') parser_env = env.Clone() parser_env.Append(YACCFLAGS = [ diff --git a/src/mesa/SConscript b/src/mesa/SConscript index 920b545a89b..dba75a26448 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -280,7 +280,7 @@ statetracker_sources = [ 'state_tracker/st_texture.c', ] -env.Append(YACCFLAGS = '-d') +env.Append(YACCFLAGS = '-d -p "_mesa_program_"') 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') -- 2.30.2