diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-12-15 11:22:19 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-12-15 11:22:19 +0000 |
| commit | 8abc860bd46a6cd584f9a64cb4613be76f82db06 (patch) | |
| tree | 25b94d69e8ef1198cd45b2d5fc0a6fde196124de /common.py | |
| parent | a22d865f93a1db7f72e0bfe216810f67bf4c2f2c (diff) | |
| parent | 3a5d260cb1d2602b9fc32392f18538d0a6ff41c2 (diff) | |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
src/gallium/winsys/gdi/SConscript
Diffstat (limited to 'common.py')
| -rw-r--r-- | common.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -61,7 +61,7 @@ def AddOptions(opts): opts.Add(EnumOption('platform', 'target platform', default_platform, allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince'))) opts.Add(EnumOption('toolchain', 'compiler toolchain', 'default', - allowed_values=('default', 'crossmingw'))) + allowed_values=('default', 'crossmingw', 'winddk'))) opts.Add(BoolOption('llvm', 'use LLVM', 'no')) opts.Add(BoolOption('dri', 'build DRI drivers', default_dri)) |