diff options
| author | Nicolai Hähnle <[email protected]> | 2009-09-21 13:26:50 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <[email protected]> | 2009-09-21 13:26:50 +0200 |
| commit | 81c7561d9d3faf70ac22c6a5f3fbea18f53eed92 (patch) | |
| tree | 5ec097e0e1fe99804104d3a56923c16edf1533aa /common.py | |
| parent | f02f63997ce65530788a6dfcb28f11790a14d938 (diff) | |
| parent | 3083ba38f4c884b32cd0460607b5064b6b7008d2 (diff) | |
Merge branch 'master' into r300-compiler
There were additional non-textual conflicts.
Conflicts:
src/gallium/drivers/r300/r300_tgsi_to_rc.c
src/mesa/drivers/dri/r300/compiler/r3xx_vertprog.c
src/mesa/drivers/dri/r300/compiler/radeon_program.c
src/mesa/drivers/dri/r300/compiler/radeon_program_alu.c
Diffstat (limited to 'common.py')
| -rw-r--r-- | common.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common.py b/common.py index a687efc86fa..3b6bf52c035 100644 --- a/common.py +++ b/common.py @@ -33,9 +33,9 @@ else: default_machine = _platform.machine() default_machine = _machine_map.get(default_machine, 'generic') -if default_platform in ('linux', 'freebsd', 'darwin'): +if default_platform in ('linux', 'freebsd'): default_dri = 'yes' -elif default_platform in ('winddk', 'windows', 'wince'): +elif default_platform in ('winddk', 'windows', 'wince', 'darwin'): default_dri = 'no' else: default_dri = 'no' @@ -59,7 +59,7 @@ def AddOptions(opts): opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine, allowed_values=('generic', 'ppc', 'x86', 'x86_64'))) opts.Add(EnumOption('platform', 'target platform', default_platform, - allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince'))) + allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince', 'darwin'))) opts.Add(EnumOption('toolchain', 'compiler toolchain', 'default', allowed_values=('default', 'crossmingw', 'winsdk', 'winddk'))) opts.Add(BoolOption('llvm', 'use LLVM', 'no')) |