commit 32210dea8e474f8e93f5df681fb6a8265a0cda4b
author Jason Ekstrand <jason.ekstrand@intel.com> Wed May 25 16:00:38 2016 -0700
committer Jason Ekstrand <jason.ekstrand@intel.com> Thu May 26 14:13:38 2016 -0700
tree c25fdd05d4f55131c161b7197b5ebf09eb5cf503
parent ddcfc35f62ed3ad83b100beacb5b30394dcd9960

compiler: Move glsl_to_nir to libglsl.la

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 <emil.velikov@collabora.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>

src/compiler/SConscript.glsl

diff --git a/src/compiler/SConscript.glsl b/src/compiler/SConscript.glsl
index 474df11..4252ce1 100644
--- a/src/compiler/SConscript.glsl
+++ b/src/compiler/SConscript.glsl
@@ -17,12 +17,15 @@
     '#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 = [