From 32210dea8e474f8e93f5df681fb6a8265a0cda4b Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 25 May 2016 16:00:38 -0700 Subject: compiler: Move glsl_to_nir to libglsl.la MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Right now libglsl.la depends on libnir.la so putting it in libnir.la adds a dependency on libglsl.la that goes the wrong direction. Reviewed-by: Emil Velikov Reviewed-by: Kristian Høgsberg --- src/compiler/SConscript.glsl | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/compiler/SConscript.glsl') diff --git a/src/compiler/SConscript.glsl b/src/compiler/SConscript.glsl index 474df11d566..4252ce15771 100644 --- a/src/compiler/SConscript.glsl +++ b/src/compiler/SConscript.glsl @@ -17,12 +17,15 @@ env.Prepend(CPPPATH = [ '#src/gallium/auxiliary', '#src/compiler/glsl', '#src/compiler/glsl/glcpp', + '#src/compiler/nir', ]) env.Prepend(LIBS = [mesautil]) # Make glcpp-parse.h and glsl_parser.h reachable from the include path. env.Prepend(CPPPATH = [Dir('.').abspath, Dir('glsl').abspath]) +# Make NIR headers reachable from the include path. +env.Prepend(CPPPATH = [Dir('.').abspath, Dir('nir').abspath]) glcpp_env = env.Clone() glcpp_env.Append(YACCFLAGS = [ -- cgit v1.2.3