diff options
| author | Dylan Baker <[email protected]> | 2019-05-31 09:39:32 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2019-09-16 17:54:00 +0000 |
| commit | 9e1f49aae1c5640af89228e356fd525a08006369 (patch) | |
| tree | 8ee4f736db4752f53faa6fe92907573f37c68685 /src/mesa | |
| parent | ca5782f0ee05496a4c0fefb69932d94b65b66597 (diff) | |
scons: Make scons and meson agree about path to glapi generated headers
Currently scons puts them in src/mapi/glapi, meosn puts them in
src/mapi/glapi/gen. This results in some things being compilable only by
one or the other, put them in the same places so that everyone is happy.
Reviewed-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/osmesa/SConscript | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/x11/SConscript | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/x11/glxapi.c | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/drivers/osmesa/SConscript b/src/mesa/drivers/osmesa/SConscript index b08a79eb8a5..d7e8fe84da6 100644 --- a/src/mesa/drivers/osmesa/SConscript +++ b/src/mesa/drivers/osmesa/SConscript @@ -8,6 +8,7 @@ env.Prepend(CPPPATH = [ '#src/mesa', Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers Dir('../../../mapi/glapi'), # src/mapi/glapi build path + Dir('../../../mapi/glapi/gen'), # src/mapi/glapi build path ]) env.Prepend(LIBS = [ diff --git a/src/mesa/drivers/x11/SConscript b/src/mesa/drivers/x11/SConscript index b097dcc5900..cd9eaa3ea89 100644 --- a/src/mesa/drivers/x11/SConscript +++ b/src/mesa/drivers/x11/SConscript @@ -8,6 +8,7 @@ env.Append(CPPPATH = [ '#/src/mesa', '#/src/mesa/main', Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers + Dir('../../../mapi/glapi/gen'), # src/mapi/glapi/gen build path for python-generated GL API files/headers ]) env.Append(CPPDEFINES = ['USE_XSHM']) diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c index 2ef675682e4..1ca8bb1c0ff 100644 --- a/src/mesa/drivers/x11/glxapi.c +++ b/src/mesa/drivers/x11/glxapi.c @@ -73,7 +73,7 @@ struct display_dispatch { /* skip normal ones */ #define _GLAPI_SKIP_NORMAL_ENTRY_POINTS -#include "glapi/glapitemp.h" +#include "glapitemp.h" #endif /* GLX_INDIRECT_RENDERING */ |