diff options
| author | Ben Skeggs <darktama@beleth.(none)> | 2008-02-22 12:25:15 +1100 |
|---|---|---|
| committer | Ben Skeggs <darktama@beleth.(none)> | 2008-02-22 12:25:15 +1100 |
| commit | f7922db610d05efee0ee8c5f0dadb69e3939482e (patch) | |
| tree | accfc0fdd96e1f572213cf69ea365c01bda0ef46 /src/gallium/SConscript | |
| parent | 759fa5fcc8038af4845a6d9c57b75933ef26559c (diff) | |
| parent | 446bfc32a83008e0865ec869bc80b920c907f10f (diff) | |
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
Conflicts:
src/gallium/drivers/Makefile
Diffstat (limited to 'src/gallium/SConscript')
| -rw-r--r-- | src/gallium/SConscript | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/src/gallium/SConscript b/src/gallium/SConscript index d9c20e0100..a08b4b830e 100644 --- a/src/gallium/SConscript +++ b/src/gallium/SConscript @@ -1,9 +1,29 @@ Import('*') -#env = env.Clone() +env = env.Clone() + +auxiliaries = [] + +Export('auxiliaries') + + +SConscript([ + # NOTE: order matters! + 'auxiliary/util/SConscript', + 'auxiliary/rtasm/SConscript', + 'auxiliary/tgsi/SConscript', + 'auxiliary/cso_cache/SConscript', + 'auxiliary/draw/SConscript', + 'auxiliary/pipebuffer/SConscript', +]) + +if llvm: + SConscript(['auxiliary/gallivm/SConscript']) SConscript([ - 'softpipe/SConscript', - 'i915simple/SConscript', - 'i965simple/SConscript', + 'drivers/softpipe/SConscript', + 'drivers/i915simple/SConscript', + 'drivers/i965simple/SConscript', + 'drivers/failover/SConscript', + #'drivers/cell/SConscript', ]) |