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/gallium/targets | |
| 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/gallium/targets')
| -rw-r--r-- | src/gallium/targets/libgl-xlib/SConscript | 1 | ||||
| -rw-r--r-- | src/gallium/targets/libgl-xlib/xlib.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript index b49b4e6fe2a..5764d4ff62f 100644 --- a/src/gallium/targets/libgl-xlib/SConscript +++ b/src/gallium/targets/libgl-xlib/SConscript @@ -11,6 +11,7 @@ env.Append(CPPPATH = [ '#/src/mesa/main', '#src/gallium/state_trackers/glx/xlib', Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers + Dir('../../../mapi/glapi/gen'), # src/mapi build path for python-generated GL API files/headers ]) env.Append(CPPDEFINES = ['USE_XSHM']) diff --git a/src/gallium/targets/libgl-xlib/xlib.c b/src/gallium/targets/libgl-xlib/xlib.c index 1b62afb29b5..85ddda9ed33 100644 --- a/src/gallium/targets/libgl-xlib/xlib.c +++ b/src/gallium/targets/libgl-xlib/xlib.c @@ -132,6 +132,6 @@ extern void (*linker_foo(const unsigned char *procName))() /* skip normal ones */ #define _GLAPI_SKIP_NORMAL_ENTRY_POINTS -#include "glapi/glapitemp.h" +#include "glapitemp.h" #endif /* GLX_INDIRECT_RENDERING */ |