Mesa (master): drivers/x11: scons: partially revert b9b40ef9b76

Emil Velikov evelikov at kemper.freedesktop.org
Sun Nov 29 14:38:29 UTC 2015


Module: Mesa
Branch: master
Commit: e714c971aea25323579d34d953bb597a5981bafd
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e714c971aea25323579d34d953bb597a5981bafd

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Wed Nov 25 21:31:57 2015 +0000

drivers/x11: scons: partially revert b9b40ef9b76

As glsl_types.{cpp,h} were  moved out of the sconscript (commit
b23a4859f4d "scons: Build nir/glsl_types.cpp once.") remove the dangling
includes.

Cc: Jose Fonseca <jfonseca at vmware.com>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>

---

 src/mesa/drivers/x11/SConscript |    2 --
 1 file changed, 2 deletions(-)

diff --git a/src/mesa/drivers/x11/SConscript b/src/mesa/drivers/x11/SConscript
index cd5cccd..d29f987 100644
--- a/src/mesa/drivers/x11/SConscript
+++ b/src/mesa/drivers/x11/SConscript
@@ -4,8 +4,6 @@ env = env.Clone()
 
 env.Append(CPPPATH = [
     '#/src',
-    '#/src/glsl',
-    '#/src/glsl/nir',
     '#/src/mapi',
     '#/src/mesa',
     '#/src/mesa/main',




More information about the mesa-commit mailing list