diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2009-07-20 02:06:37 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2009-07-20 02:06:37 +0200 |
| commit | 3d0009ce457c78390ba1ffa0e8a991d65a99c448 (patch) | |
| tree | 87bf80e91a91c0b38bf28ecf6cd9cd3bea51baa8 /src | |
| parent | 0b7a907f396e6de8b28316aeb7e7c9495a2fede9 (diff) | |
r300g: Fix SCons build.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/winsys/drm/radeon/SConscript | 2 | ||||
| -rw-r--r-- | src/gallium/winsys/drm/radeon/core/SConscript | 4 | ||||
| -rw-r--r-- | src/gallium/winsys/drm/radeon/dri/SConscript | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/gallium/winsys/drm/radeon/SConscript b/src/gallium/winsys/drm/radeon/SConscript index 8f99055b2f..b2dfd504d4 100644 --- a/src/gallium/winsys/drm/radeon/SConscript +++ b/src/gallium/winsys/drm/radeon/SConscript @@ -4,4 +4,4 @@ SConscript(['core/SConscript',]) if 'mesa' in env['statetrackers']: - SConscript(['dri2/SConscript']) + SConscript(['dri/SConscript']) diff --git a/src/gallium/winsys/drm/radeon/core/SConscript b/src/gallium/winsys/drm/radeon/core/SConscript index 578174e32b..2ad68e403f 100644 --- a/src/gallium/winsys/drm/radeon/core/SConscript +++ b/src/gallium/winsys/drm/radeon/core/SConscript @@ -11,7 +11,9 @@ radeon_sources = [ env.Append(CPPPATH = '#/src/gallium/drivers/r300') -env.ConvenienceLibrary( +radeonwinsys = env.ConvenienceLibrary( target ='radeonwinsys', source = radeon_sources, ) + +Export('radeonwinsys') diff --git a/src/gallium/winsys/drm/radeon/dri/SConscript b/src/gallium/winsys/drm/radeon/dri/SConscript index f2cdee97d9..aea987a3ac 100644 --- a/src/gallium/winsys/drm/radeon/dri/SConscript +++ b/src/gallium/winsys/drm/radeon/dri/SConscript @@ -2,7 +2,10 @@ Import('*') env = drienv.Clone() +env.ParseConfig('pkg-config --cflags --libs libdrm_radeon') + drivers = [ + trace, softpipe, r300 ] @@ -10,5 +13,5 @@ drivers = [ env.SharedLibrary( target ='radeon_dri.so', source = COMMON_GALLIUM_SOURCES, - LIBS = drivers + mesa + auxiliaries + env['LIBS'], + LIBS = st_dri + radeonwinsys + mesa + drivers + auxiliaries + env['LIBS'], ) |