fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 17:48:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

scons: Make scons and meson agree about path to glapi generated headers

Browse source 
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>
This commit is contained in:
Dylan Baker 2019-05-31 09:39:32 -07:00
parent ca5782f0ee
commit 9e1f49aae1
8 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gallium/targets/libgl-xlib/SConscript
View file

@ -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'])

2
src/gallium/targets/libgl-xlib/xlib.c
View file

@ -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 */

2
src/mapi/glapi/SConscript
View file

@ -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 = [

2
src/mapi/glapi/gen/SConscript
View file

@ -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'

2
src/mapi/glapi/glapi_dispatch.c
View file

@ -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 */

1
src/mesa/drivers/osmesa/SConscript
View file

@ -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 = [

1
src/mesa/drivers/x11/SConscript
View file

@ -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'])

2
src/mesa/drivers/x11/glxapi.c
View file

@ -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 */