Merge branch 'xa_branch'

[mesa.git] / src / gallium / drivers / r600 / SConscript

diff --git a/src/gallium/drivers/r600/SConscript b/src/gallium/drivers/r600/SConscript
index 64980140963a65ad1ab2415b1cd80b633a92eaa2..19f07b2bef8f306d90f368e70f5a5c8a117b6d25 100644 (file)
--- a/src/gallium/drivers/r600/SConscript
+++ b/src/gallium/drivers/r600/SConscript
@@ -2,14 +2,10 @@ Import('*')
 
 env = env.Clone()
 
-try:
-    env.ParseConfig('pkg-config --cflags libdrm_radeon')
-except OSError:
-    print 'warning: not building r600'
-    Return()
+env.PkgUseModules('DRM_RADEON')
 
 env.Append(CPPPATH = [
-    '#/include', 
+    '#/include',
     '#/src/mesa',
 ])
 
@@ -19,7 +15,6 @@ r600 = env.ConvenienceLibrary(
         'r600_asm.c',
         'r600_buffer.c',
         'r600_blit.c',
-        'r600_helper.c',
         'r600_pipe.c',
         'r600_query.c',
         'r600_resource.c',
@@ -28,7 +23,6 @@ r600 = env.ConvenienceLibrary(
         'r600_state_common.c',
         'r600_texture.c',
         'r600_translate.c',
-        'r600_upload.c',
         'r700_asm.c',
         'evergreen_state.c',
         'eg_asm.c',