diff options
| author | Thomas Balling Sørensen <tball@tball-laptop.(none)> | 2010-10-05 12:04:08 +0200 |
|---|---|---|
| committer | Thomas Balling Sørensen <tball@tball-laptop.(none)> | 2010-10-05 12:04:08 +0200 |
| commit | 1218430e1200a08cd64b6555d3fd1fd0274ad9e5 (patch) | |
| tree | e060fb27b8388a4bd237ca39fc20f1675c5e367c /src/gallium/drivers/sw/SConscript | |
| parent | 63b1525cf0a50e3d31328c3b56355a86056e4c05 (diff) | |
| parent | bf21b7006c63c3dc47045c22d4f372dfe6c7ce67 (diff) | |
Merge branch 'master' into pipe-video
Conflicts:
configs/linux-dri
configure.ac
src/gallium/drivers/nvfx/Makefile
src/gallium/include/pipe/p_defines.h
src/gallium/include/pipe/p_screen.h
src/gallium/include/state_tracker/dri1_api.h
src/gallium/include/state_tracker/drm_api.h
src/gallium/tests/python/samples/tri.py
src/gallium/tests/trivial/Makefile
src/gallium/tests/unit/Makefile
src/gallium/tests/unit/SConscript
src/gallium/tests/unit/u_format_test.c
src/gallium/winsys/nouveau/drm/nouveau_drm_api.c
Diffstat (limited to 'src/gallium/drivers/sw/SConscript')
| -rw-r--r-- | src/gallium/drivers/sw/SConscript | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/gallium/drivers/sw/SConscript b/src/gallium/drivers/sw/SConscript index 37d0a0d63ce..e9ebf751ddd 100644 --- a/src/gallium/drivers/sw/SConscript +++ b/src/gallium/drivers/sw/SConscript @@ -5,32 +5,34 @@ # rasterizers into a single driver. A software rasterizer is defined # as any driver which takes an sw_winsys pointer as the only argument # to create_screen. -# -# XXX: unfortunately users of this driver still need to link in any -# extra libraries needed for the particular driver (eg llvm for -# llvmpipe). Not sure how to get around this. Import('*') env = env.Clone() +# To avoid targets having to check extensively or add drivers on a whim, append +# all referenced extra drivers to the exported symbol. +extra = [] if True: env.Append(CPPDEFINES = 'GALLIUM_SOFTPIPE') env.Prepend(LIBS = [softpipe]) + extra.append(softpipe) if env['llvm']: env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE') env.Tool('udis86') env.Prepend(LIBS = [llvmpipe]) - + extra.append(llvmpipe) + if 'cell' in env['drivers']: env.Append(CPPDEFINES = 'GALLIUM_CELL') env.Prepend(LIBS = [cell]) + extra.append(cell) sw = env.ConvenienceLibrary( target = 'sw', source = [ 'sw.c', ] - ) - Export('sw') + ) + extra +Export('sw') |