dri: fromPlanar() can return NULL as a valid result

[mesa.git] / src / compiler / SConscript

diff --git a/src/compiler/SConscript b/src/compiler/SConscript
index 8d71b82bee07bd144714667a26aa5f78b436dd6e..44509a9a95b261a07dd9aeb98319d1b158619212 100644 (file)
--- a/src/compiler/SConscript
+++ b/src/compiler/SConscript
@@ -13,6 +13,10 @@ env.Prepend(CPPPATH = [
     '#src/gallium/auxiliary',
 ])
 
+# Make generated headers reachable from the include path.
+env.Prepend(CPPPATH = [Dir('.').abspath, Dir('glsl').abspath])
+env.Prepend(CPPPATH = [Dir('.').abspath, Dir('nir').abspath])
+
 sources = env.ParseSourceList('Makefile.sources', 'LIBCOMPILER_FILES')
 
 compiler = env.ConvenienceLibrary(
@@ -21,4 +25,5 @@ compiler = env.ConvenienceLibrary(
 )
 Export('compiler')
 
-SConscript('glsl/SConscript')
+SConscript('SConscript.glsl')
+SConscript('SConscript.nir')