diff options
| author | Christian König <[email protected]> | 2011-01-20 22:10:37 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-01-20 22:10:37 +0100 |
| commit | d2ff6b8715e817c1ef14d4bf12be58c19d894143 (patch) | |
| tree | 281badfe8638da50221270af29e16da1e40d9a6a /src/SConscript | |
| parent | e755c7bec3bc722ee451bdaed8da741f337d33b3 (diff) | |
| parent | d136d1d2e1174d2420ce5e32507904243ab240cd (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_asm.c
src/gallium/drivers/r600/r600_shader.c
Diffstat (limited to 'src/SConscript')
| -rw-r--r-- | src/SConscript | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/SConscript b/src/SConscript index c42d9bff2d7..201812c5ac3 100644 --- a/src/SConscript +++ b/src/SConscript @@ -1,16 +1,20 @@ Import('*') -SConscript('mapi/vgapi/SConscript') - if env['platform'] == 'windows': - SConscript('egl/main/SConscript') + SConscript('getopt/SConscript') SConscript('talloc/SConscript') +else: + talloc = 'talloc' + Export('talloc') SConscript('glsl/SConscript') SConscript('mapi/glapi/SConscript') SConscript('mesa/SConscript') +SConscript('mapi/vgapi/SConscript') + if env['platform'] != 'embedded': + SConscript('egl/main/SConscript') SConscript('glut/glx/SConscript') SConscript('gallium/SConscript') |