summaryrefslogtreecommitdiff
path: root/src/gallium/SConscript
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2008-02-16 16:30:22 +1100
committerBen Skeggs <skeggsb@gmail.com>2008-02-16 16:30:22 +1100
commit87e3301533aa4d3e6e98db139887ebba3d217f7d (patch)
treead80803f8f90263ea4c9adf9b3e7dd8eae4b05fa /src/gallium/SConscript
parent49405c43f245d3b3ddd12e891413bf7ead23145c (diff)
parent3320b1874e810583f95b93a89697b2955987b84f (diff)
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
Conflicts: configs/linux-dri src/mesa/pipe/Makefile
Diffstat (limited to 'src/gallium/SConscript')
-rw-r--r--src/gallium/SConscript9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
new file mode 100644
index 0000000000..d9c20e0100
--- /dev/null
+++ b/src/gallium/SConscript
@@ -0,0 +1,9 @@
+Import('*')
+
+#env = env.Clone()
+
+SConscript([
+ 'softpipe/SConscript',
+ 'i915simple/SConscript',
+ 'i965simple/SConscript',
+])