diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-20 09:41:09 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-20 09:41:09 +0100 |
| commit | c5f912c7b9248440bf9dff4b3c64513ec0f3ec98 (patch) | |
| tree | 7986b288489dac6a8a70787dbdedfc0c064a0c02 /mesalib/common.py | |
| parent | 27bec2ba601ec12334e6b7564034f87ab7c9522b (diff) | |
| parent | a8ef69cc0c9e5281e6b745dd4a2be75f629eb8b8 (diff) | |
| download | vcxsrv-c5f912c7b9248440bf9dff4b3c64513ec0f3ec98.tar.gz vcxsrv-c5f912c7b9248440bf9dff4b3c64513ec0f3ec98.tar.bz2 vcxsrv-c5f912c7b9248440bf9dff4b3c64513ec0f3ec98.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/common.py')
| -rw-r--r-- | mesalib/common.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mesalib/common.py b/mesalib/common.py index 5578f72af..f0b1ccc2c 100644 --- a/mesalib/common.py +++ b/mesalib/common.py @@ -31,9 +31,15 @@ _machine_map = { 'i486': 'x86', 'i586': 'x86', 'i686': 'x86', + 'BePC': 'x86', + 'Intel': 'x86', 'ppc' : 'ppc', + 'BeBox': 'ppc', + 'BeMac': 'ppc', 'AMD64': 'x86_64', 'x86_64': 'x86_64', + 'sparc': 'sparc', + 'sun4u': 'sparc', } @@ -83,7 +89,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', 'windows', 'darwin', 'cygwin', 'sunos', 'freebsd8'))) + allowed_values=('linux', 'windows', 'darwin', 'cygwin', 'sunos', 'freebsd8', 'haiku'))) opts.Add(BoolOption('embedded', 'embedded build', 'no')) opts.Add('toolchain', 'compiler toolchain', default_toolchain) opts.Add(BoolOption('gles', 'EXPERIMENTAL: enable OpenGL ES support', 'no')) |