diff options
| author | Brian Paul <brianp@vmware.com> | 2009-02-10 16:44:02 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-02-10 16:44:02 -0700 |
| commit | 5340b6dff73a0a23531ce2a5f28fba8303adab6e (patch) | |
| tree | b141fc3648568dd8b941c966059e6ed32a8bd0ad /src/SConscript | |
| parent | 9fd26daec24f21dbe17afcb2e2ab272667ee9a69 (diff) | |
| parent | ee4c921b65fb76998711f3c40330505cbc49a0e0 (diff) | |
Merge commit 'origin/gallium-master-merge'
This is the big merge of the gallium-0.2 branch into master.
gallium-master-merge was just the staging area for it.
Both gallium-0.2 and gallium-master-merge are considered closed now.
Conflicts:
progs/demos/Makefile
src/mesa/main/state.c
src/mesa/main/texenvprogram.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') |