scons: Make scons and meson agree about path to glapi generated headers
authorDylan Baker <dylan@pnwbakers.com>
Fri, 31 May 2019 16:39:32 +0000 (09:39 -0700)
committerDylan Baker <dylan@pnwbakers.com>
Mon, 16 Sep 2019 17:54:00 +0000 (17:54 +0000)
commit9e1f49aae1c5640af89228e356fd525a08006369
tree8ee4f736db4752f53faa6fe92907573f37c68685
parentca5782f0ee05496a4c0fefb69932d94b65b66597
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 <eric.engestrom@intel.com>
src/gallium/targets/libgl-xlib/SConscript
src/gallium/targets/libgl-xlib/xlib.c
src/mapi/glapi/SConscript
src/mapi/glapi/gen/SConscript
src/mapi/glapi/glapi_dispatch.c
src/mesa/drivers/osmesa/SConscript
src/mesa/drivers/x11/SConscript
src/mesa/drivers/x11/glxapi.c