diff options
| author | Christian König <[email protected]> | 2011-02-24 22:02:42 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-02-24 22:02:42 +0100 |
| commit | b922a0ce12916a91cfc3e56714913fcf63279ff2 (patch) | |
| tree | e24fa039925220882d155ccb987f7914e83f4372 /src/gallium/winsys/radeon/drm/SConscript | |
| parent | f013b4f8f1329982727691a55cc263e3011d02bf (diff) | |
| parent | c0ad70ae31ee5501281b434d56e389fc92b13a3a (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
configure.ac
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
src/gallium/drivers/r600/r600_asm.c
src/gallium/drivers/r600/r600_asm.h
src/gallium/drivers/r600/r600_shader.c
src/gallium/drivers/r600/r600_state_inlines.h
src/gallium/drivers/r600/r600_texture.c
Diffstat (limited to 'src/gallium/winsys/radeon/drm/SConscript')
| -rw-r--r-- | src/gallium/winsys/radeon/drm/SConscript | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/gallium/winsys/radeon/drm/SConscript b/src/gallium/winsys/radeon/drm/SConscript index 80816621848..b16e03556d3 100644 --- a/src/gallium/winsys/radeon/drm/SConscript +++ b/src/gallium/winsys/radeon/drm/SConscript @@ -3,13 +3,17 @@ Import('*') env = env.Clone() radeon_sources = [ - 'radeon_drm_buffer.c', + 'radeon_drm_bo.c', 'radeon_drm_cs.c', 'radeon_drm_common.c', - 'radeon_r300.c', ] -env.ParseConfig('pkg-config --cflags libdrm_radeon') +try: + env.ParseConfig('pkg-config --cflags libdrm_radeon') +except: + print 'warning: not building r300g' + Return() + env.Append(CPPPATH = '#/src/gallium/drivers/r300') radeonwinsys = env.ConvenienceLibrary( |