[Mesa-dev] [PATCH] scons: Add glsl/glcpp to the include path.

Brian Paul brianp at vmware.com
Wed Jun 20 07:35:27 PDT 2012


On 06/20/2012 12:15 AM, Vinson Lee wrote:
> Fixes this build failure on Solaris.
>
>    Compiling build/sunos-debug/glsl/glcpp/glcpp-lex.c ...
> "src/glsl/glcpp/glcpp-lex.l", line 30: cannot find include file: "glcpp-parse.h"
>
> Signed-off-by: Vinson Lee<vlee at freedesktop.org>
> ---
>   src/glsl/SConscript |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/glsl/SConscript b/src/glsl/SConscript
> index f8e8723..2fc57c6 100644
> --- a/src/glsl/SConscript
> +++ b/src/glsl/SConscript
> @@ -14,8 +14,8 @@ 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])
> +# 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')
>

Looks OK to me.

Reviewed-by: Brian Paul <brianp at vmware.com>


More information about the mesa-dev mailing list