[Mesa-dev] [PATCH] scons: Fix glapi include path changes

[Dylan Baker]

fixes: 5daed06da2c0aaa4 ("osmesa: Include generated headers without path")
cc: Mark Janes <mark.a.janes at intel.com>
Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
 src/mapi/glapi/SConscript          | 1 +
 src/mesa/drivers/osmesa/SConscript | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/mapi/glapi/SConscript b/src/mapi/glapi/SConscript
index 994778a8fb9..11f2b6dddfd 100644
--- a/src/mapi/glapi/SConscript
+++ b/src/mapi/glapi/SConscript
@@ -31,6 +31,7 @@ env.Append(CPPPATH = [
     '#/src/mapi',
     '#/src/mesa',
     Dir('..'), # src/mapi build path
+    Dir('.'), # src/mapi/glapi build path
 ])
 
 glapi_sources = [
diff --git a/src/mesa/drivers/osmesa/SConscript b/src/mesa/drivers/osmesa/SConscript
index 728031446e5..43da571f085 100644
--- a/src/mesa/drivers/osmesa/SConscript
+++ b/src/mesa/drivers/osmesa/SConscript
@@ -6,7 +6,9 @@ env.Prepend(CPPPATH = [
     '#src',
     '#src/mapi',
     '#src/mesa',
-    Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers
+    # src/mapi{/glapi} build path for python-generated GL API files/headers
+    Dir('../../../mapi'),
+    Dir('../../../mapi/glapi'),
 ])
 
 env.Prepend(LIBS = [
-- 
2.14.2