diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-04-09 10:14:35 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-04-09 10:31:08 +1000 |
| commit | d1a9b1f513109c975a5a7ed5a2d0c329b280afe4 (patch) | |
| tree | 5c85af47b4f5af0661acf129e3ce3f59e43cbfd9 /src/gallium/winsys/drm/radeon/SConscript | |
| parent | 90ffce497395d8c02fee2ea4ee4c025eede3d876 (diff) | |
| parent | 8648c2685870174cf620ef15de70ef030a8d5a20 (diff) | |
Merge remote branch 'origin/master' into radeon-rewrite
Conflicts:
src/mesa/drivers/dri/r200/r200_tex.c
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_context.h
src/mesa/drivers/dri/r300/r300_swtcl.c
src/mesa/drivers/dri/r300/r300_tex.c
src/mesa/drivers/dri/r300/r300_texmem.c
src/mesa/drivers/dri/r300/r300_texstate.c
src/mesa/drivers/dri/radeon/radeon_tex.c
Diffstat (limited to 'src/gallium/winsys/drm/radeon/SConscript')
| -rw-r--r-- | src/gallium/winsys/drm/radeon/SConscript | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/src/gallium/winsys/drm/radeon/SConscript b/src/gallium/winsys/drm/radeon/SConscript index 2435211a32..8f99055b2f 100644 --- a/src/gallium/winsys/drm/radeon/SConscript +++ b/src/gallium/winsys/drm/radeon/SConscript @@ -1,29 +1,7 @@ Import('*') -if 'mesa' in env['statetrackers']: - - env = drienv.Clone() - - DRIVER_SOURCES = [ - 'radeon_buffer.c', - 'radeon_context.c', - 'radeon_screen.c', - 'radeon_winsys_softpipe.c', - ] +SConscript(['core/SConscript',]) - sources = \ - COMMON_GALLIUM_SOURCES + \ - DRIVER_SOURCES - - drivers = [ - softpipe, - r300 - ] - - # TODO: write a wrapper function http://www.scons.org/wiki/WrapperFunctions - env.SharedLibrary( - target ='radeon_dri.so', - source = sources, - LIBS = drivers + mesa + auxiliaries + env['LIBS'], - ) +if 'mesa' in env['statetrackers']: + SConscript(['dri2/SConscript']) |