Merge remote-tracking branch 'origin/master' into pipe-video

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

diff --git a/src/gallium/drivers/r300/SConscript b/src/gallium/drivers/r300/SConscript
index 552ed4e5bef142e5573568816b264ea16a20cd4d..3af157a7956be92435d6974de7a1a61b7f5287f6 100644 (file)
--- a/src/gallium/drivers/r300/SConscript
+++ b/src/gallium/drivers/r300/SConscript
@@ -6,7 +6,6 @@ env = env.Clone()
 # add the paths for r300compiler
 env.Append(CPPPATH = [
     '#/src/mesa/drivers/dri/r300/compiler', 
-    '#/src/gallium/winsys/drm/radeon/core',
     '#/include', 
     '#/src/mesa',
 ])
@@ -34,9 +33,12 @@ r300 = env.ConvenienceLibrary(
         'r300_vs.c',
         'r300_vs_draw.c',
         'r300_texture.c',
+        'r300_texture_desc.c',
         'r300_tgsi_to_rc.c',
         'r300_transfer.c',
     ] + r300compiler) + r300compiler
 
+env.Alias('r300', r300)
+
 Export('r300')