Merge commit 'origin/master' into gallium-0.2

[mesa.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index a3bf5c5d5791ab5b5a362a8c4defe0bcfff131dc..8c96817daefc04264a0a2863f2d1a02b9577272b 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -29,32 +29,33 @@ import common
 #######################################################################
 # Configuration options
 
+default_statetrackers = 'mesa'
+
 if common.default_platform in ('linux', 'freebsd', 'darwin'):
-       default_statetrackers = 'all'
-       default_drivers = 'softpipe,failover,i915simple,i965simple'
+       default_drivers = 'softpipe,failover,i915simple,i965simple,trace'
        default_winsys = 'xlib'
 elif common.default_platform in ('winddk',):
-       default_statetrackers = 'all'
-       default_drivers = 'softpipe,i915simple'
+       default_drivers = 'softpipe,i915simple,trace'
        default_winsys = 'all'
 else:
-       default_statetrackers = 'all'
        default_drivers = 'all'
        default_winsys = 'all'
 
 opts = Options('config.py')
 common.AddOptions(opts)
 opts.Add(ListOption('statetrackers', 'state trackers to build', default_statetrackers,
-                     ['mesa']))
+                     ['mesa', 'python']))
 opts.Add(ListOption('drivers', 'pipe drivers to build', default_drivers,
-                     ['softpipe', 'failover', 'i915simple', 'i965simple', 'cell']))
+                     ['softpipe', 'failover', 'i915simple', 'i965simple', 'cell', 'trace']))
 opts.Add(ListOption('winsys', 'winsys drivers to build', default_winsys,
                      ['xlib', 'intel', 'gdi'])) 
 
+opts.Add(EnumOption('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))
+
 env = Environment(
        options = opts,
        tools = ['gallium'],
-       toolpath = ['scons'],   
+       toolpath = ['#scons'],  
        ENV = os.environ,
 )
 
@@ -69,12 +70,14 @@ platform = env['platform']
 
 # derived options
 x86 = machine == 'x86'
+ppc = machine == 'ppc'
 gcc = platform in ('linux', 'freebsd', 'darwin')
 msvc = platform in ('windows', 'winddk')
 
 Export([
        'debug', 
        'x86', 
+       'ppc', 
        'dri', 
        'llvm',
        'platform',