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/mapi | |
| 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/mapi')
| -rw-r--r-- | src/mapi/glapi/SConscript | 2 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/SConscript | 2 | ||||
| -rw-r--r-- | src/mapi/glapi/glapi_dispatch.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mapi/glapi/SConscript b/src/mapi/glapi/SConscript index 118da1d53f7..a086f435efc 100644 --- a/src/mapi/glapi/SConscript +++ b/src/mapi/glapi/SConscript @@ -27,7 +27,7 @@ env.Append(CPPPATH = [ '#/src/mapi', '#/src/mesa', Dir('.'), # src/mapi/glapi build path - Dir('..'), # src/mapi build path + Dir('gen'), # src/mapi/glapi/gen build path ]) glapi_sources = [ diff --git a/src/mapi/glapi/gen/SConscript b/src/mapi/glapi/gen/SConscript index ff0df745c2c..942b5594231 100644 --- a/src/mapi/glapi/gen/SConscript +++ b/src/mapi/glapi/gen/SConscript @@ -28,7 +28,7 @@ env.CodeGenerate( ) env.CodeGenerate( - target = '../../../mapi/glapi/glapitemp.h', + target = '../../../mapi/glapi/gen/glapitemp.h', script = 'gl_apitemp.py', source = sources, command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET' diff --git a/src/mapi/glapi/glapi_dispatch.c b/src/mapi/glapi/glapi_dispatch.c index ca15449ed01..96fd0d6a285 100644 --- a/src/mapi/glapi/glapi_dispatch.c +++ b/src/mapi/glapi/glapi_dispatch.c @@ -175,6 +175,6 @@ GL_API void GL_APIENTRY glPrimitiveBoundingBox (GLfloat minX, GLfloat minY, GLfl # endif #endif -#include "glapi/glapitemp.h" +#include "glapitemp.h" #endif /* USE_X86_ASM */ |