diff options
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/state_trackers/vega/SConscript | 6 | ||||
| -rw-r--r-- | src/gallium/targets/libgl-xlib/SConscript | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/gallium/state_trackers/vega/SConscript b/src/gallium/state_trackers/vega/SConscript index 3dada101339..b68a73299a1 100644 --- a/src/gallium/state_trackers/vega/SConscript +++ b/src/gallium/state_trackers/vega/SConscript @@ -9,6 +9,7 @@ env = env.Clone() env.Append(CPPPATH = [ '#/src/mapi', + Dir('.'), ]) env.Append(CPPDEFINES = [ 'VEGA_VERSION_STRING=', @@ -47,13 +48,12 @@ vega_sources = [ 'vgu.c' ] -api_tmp = env.CodeGenerate( - target = '#/src/gallium/state_trackers/vega/api_tmp.h', +api_tmp, = env.CodeGenerate( + target = 'api_tmp.h', script = '#src/mapi/mapi/mapi_abi.py', source = '#src/mapi/vgapi/vgapi.csv', command = python_cmd + ' $SCRIPT --printer vgapi --mode app $SOURCE > $TARGET' ) -env.Depends(vega_sources, api_tmp) st_vega = env.ConvenienceLibrary( target = 'st_vega', diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript index dc1ce89ca49..58ed6d4a30f 100644 --- a/src/gallium/targets/libgl-xlib/SConscript +++ b/src/gallium/targets/libgl-xlib/SConscript @@ -10,6 +10,7 @@ env.Append(CPPPATH = [ '#/src/mesa', '#/src/mesa/main', '#src/gallium/state_trackers/glx/xlib', + Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers ]) env.Append(CPPDEFINES = ['USE_XSHM']) @@ -36,9 +37,6 @@ sources = [ 'xlib.c', ] -# The sources depend on the python-generated GL API files/headers. -env.Depends(sources, glapi_headers) - if True: env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_GALAHAD', 'GALLIUM_SOFTPIPE']) env.Prepend(LIBS = [trace, rbug, galahad, softpipe]) |