diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-02-13 01:11:25 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-02-13 01:11:25 +1000 |
| commit | 53116910b10e3b8a05f42970eff311c21808699f (patch) | |
| tree | 6831e50a56a02fed324f8cb119e05d837e00d7cf /src/SConscript | |
| parent | 7e104f9cde94279a902b408e8d1cf21779b393a8 (diff) | |
| parent | 0ccbc3c905f0594a35d72887a1f115e148aaa596 (diff) | |
Merge remote branch 'origin/master' into radeon-rewrite
Conflicts:
configure.ac
src/mesa/drivers/dri/r200/r200_context.c
src/mesa/drivers/dri/r300/r300_render.c
Diffstat (limited to 'src/SConscript')
| -rw-r--r-- | src/SConscript | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/SConscript b/src/SConscript new file mode 100644 index 0000000000..5440acd135 --- /dev/null +++ b/src/SConscript @@ -0,0 +1,11 @@ +Import('*') + +SConscript('gallium/SConscript') + +if 'mesa' in env['statetrackers']: + SConscript('mesa/SConscript') + +SConscript('gallium/winsys/SConscript') + +SConscript('glut/glx/SConscript') +SConscript('glew/SConscript') |