X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=common.py;h=8657030ea3f6480109e9fb17c12f7f4dbd4f9a9f;hp=13e8dc83e978bbcd2df2b3b92d38d977be7ecd51;hb=9a7f84d6b28e180ef79349b36de9a5d58a1e2dc9;hpb=695cc370a280a637f411f5ff3877b3fd1c05e424

diff --git a/common.py b/common.py
index 13e8dc83e97..8657030ea3f 100644
--- a/common.py
+++ b/common.py
@@ -8,17 +8,22 @@ import subprocess
 import sys
 import platform as _platform
 
+import SCons.Script.SConscript
+
 
 #######################################################################
 # Defaults
 
-_platform_map = {
-	'linux2': 'linux',
-	'win32': 'windows',
-}
+host_platform = _platform.system().lower()
+if host_platform.startswith('cygwin'):
+    host_platform = 'cygwin'
 
-default_platform = sys.platform
-default_platform = _platform_map.get(default_platform, default_platform)
+# Search sys.argv[] for a "platform=foo" argument since we don't have
+# an 'env' variable at this point.
+if 'platform' in SCons.Script.ARGUMENTS:
+    target_platform = SCons.Script.ARGUMENTS['platform']
+else:
+    target_platform = host_platform
 
 _machine_map = {
 	'x86': 'x86',
@@ -27,48 +32,39 @@ _machine_map = {
 	'i586': 'x86',
 	'i686': 'x86',
 	'ppc' : 'ppc',
+	'AMD64': 'x86_64',
 	'x86_64': 'x86_64',
 }
 
 
-# find default_machine value
+# find host_machine value
 if 'PROCESSOR_ARCHITECTURE' in os.environ:
-	default_machine = os.environ['PROCESSOR_ARCHITECTURE']
+	host_machine = os.environ['PROCESSOR_ARCHITECTURE']
 else:
-	default_machine = _platform.machine()
-default_machine = _machine_map.get(default_machine, 'generic')
+	host_machine = _platform.machine()
+host_machine = _machine_map.get(host_machine, 'generic')
+
+default_machine = host_machine
+default_toolchain = 'default'
+
+if target_platform == 'windows' and host_platform != 'windows':
+    default_machine = 'x86'
+    default_toolchain = 'crossmingw'
 
 
 # find default_llvm value
 if 'LLVM' in os.environ:
     default_llvm = 'yes'
 else:
-    # Search sys.argv[] for a "platform=foo" argument since we don't have
-    # an 'env' variable at this point.
-    platform = default_platform
-    pattern = re.compile("(platform=)(.*)")
-    for arg in sys.argv:
-        m = pattern.match(arg)
-        if m:
-            platform = m.group(2)
-
     default_llvm = 'no'
     try:
-        if platform != 'windows' and subprocess.call(['llvm-config', '--version'], stdout=subprocess.PIPE) == 0:
+        if target_platform != 'windows' and \
+           subprocess.call(['llvm-config', '--version'], stdout=subprocess.PIPE) == 0:
             default_llvm = 'yes'
     except:
         pass
 
 
-# find default_dri value
-if default_platform in ('linux', 'freebsd'):
-	default_dri = 'yes'
-elif default_platform in ('winddk', 'windows', 'wince', 'darwin'):
-	default_dri = 'no'
-else:
-	default_dri = 'no'
-
-
 #######################################################################
 # Common options
 
@@ -83,13 +79,17 @@ 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', default_platform,
-											 allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince', 'darwin', 'embedded', 'cygwin', 'sunos5', 'freebsd8')))
-	opts.Add('toolchain', 'compiler toolchain', 'default')
+	opts.Add(EnumOption('platform', 'target platform', host_platform,
+											 allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince', 'darwin', 'cygwin', 'sunos', 'freebsd8')))
+	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('dri', 'build DRI drivers', default_dri))
 	opts.Add(BoolOption('debug', 'DEPRECATED: debug build', 'yes'))
 	opts.Add(BoolOption('profile', 'DEPRECATED: profile build', 'no'))
+	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')))