scons: Fix SCons build infrastructure for FreeBSD.

[mesa.git] / common.py

diff --git a/common.py b/common.py
index b44f20e821667030383adf9dd70f2c07c2b53501..6121a41140338bfc4a3fd7b78bf3f7769e60b5bb 100644 (file)
--- a/common.py
+++ b/common.py
@@ -15,6 +15,8 @@ import SCons.Script.SConscript
 # Defaults
 
 host_platform = _platform.system().lower()
+if host_platform.startswith('cygwin'):
+    host_platform = 'cygwin'
 
 # Search sys.argv[] for a "platform=foo" argument since we don't have
 # an 'env' variable at this point.
@@ -29,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',
 }
 
 
@@ -77,14 +85,18 @@ def AddOptions(opts):
                from SCons.Options.EnumOption import EnumOption
        opts.Add(EnumOption('build', 'build type', 'debug',
                          allowed_values=('debug', 'checked', 'profile', 'release')))
-       opts.Add(BoolOption('quiet', 'quiet command lines', 'yes'))
+       opts.Add(BoolOption('verbose', 'verbose output', 'no'))
        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_nt-5.1', 'cygwin_nt-6.1', 'sunos5', 'freebsd8')))
+                                                                                        allowed_values=('cygwin', 'darwin', 'freebsd', 'haiku', 'linux', 'sunos', 'windows')))
+       opts.Add(BoolOption('embedded', 'embedded build', 'no'))
        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))
+       opts.Add(BoolOption('openmp', 'EXPERIMENTAL: compile with openmp (swrast)', 'no'))
        opts.Add(BoolOption('debug', 'DEPRECATED: debug build', 'yes'))
        opts.Add(BoolOption('profile', 'DEPRECATED: profile build', 'no'))
-       opts.Add(EnumOption('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))
+       opts.Add(BoolOption('quiet', 'DEPRECATED: profile build', 'yes'))
+       if host_platform == 'windows':
+               opts.Add(EnumOption('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))