diff options
| author | Vinson Lee <[email protected]> | 2011-02-23 18:21:14 -0800 |
|---|---|---|
| committer | Vinson Lee <[email protected]> | 2011-02-23 18:21:14 -0800 |
| commit | 100cd214e37265776639c56018270805829ea952 (patch) | |
| tree | a000e50d9e4a048ef80adfefba5c3343c33436b5 | |
| parent | 8fb0ecd0cf4a4d672c0744abb4a9f030b3a17527 (diff) | |
scons: Fix Cygwin platform names.
Fixes immediate Python exceptions with SCons on Cygwin.
| -rw-r--r-- | common.py | 2 | ||||
| -rw-r--r-- | src/gallium/winsys/sw/xlib/SConscript | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/common.py b/common.py index b74b204a04f..b44f20e8216 100644 --- a/common.py +++ b/common.py @@ -81,7 +81,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', host_platform, - allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince', 'darwin', 'embedded', 'cygwin', 'sunos5', 'freebsd8'))) + allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince', 'darwin', 'embedded', 'cygwin_nt-5.1', 'cygwin_nt-6.1', 'sunos5', 'freebsd8'))) opts.Add('toolchain', 'compiler toolchain', default_toolchain) opts.Add(BoolOption('gles', 'EXPERIMENTAL: enable OpenGL ES support', 'no')) opts.Add(BoolOption('llvm', 'use LLVM', default_llvm)) diff --git a/src/gallium/winsys/sw/xlib/SConscript b/src/gallium/winsys/sw/xlib/SConscript index df01a9ec2bf..f6c47411831 100644 --- a/src/gallium/winsys/sw/xlib/SConscript +++ b/src/gallium/winsys/sw/xlib/SConscript @@ -4,7 +4,7 @@ Import('*') -if env['platform'] in ('cygwin', 'linux'): +if env['platform'] in ('cygwin_nt-5.1', 'cygwin_nt-6.1', 'linux'): env = env.Clone() |