X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=SConstruct;h=89144f7579da4637098f24a50a4c70183a033357;hb=cade071d525f71069f635fd0b705e64d897b32c4;hp=8c96817daefc04264a0a2863f2d1a02b9577272b;hpb=b0caa10a85b39f0e657dc0c4816884c9356b0b1a;p=mesa.git

diff --git a/SConstruct b/SConstruct
index 8c96817daef..89144f7579d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -32,7 +32,7 @@ import common
 default_statetrackers = 'mesa'
 
 if common.default_platform in ('linux', 'freebsd', 'darwin'):
-	default_drivers = 'softpipe,failover,i915simple,i965simple,trace'
+	default_drivers = 'softpipe,failover,i915simple,trace'
 	default_winsys = 'xlib'
 elif common.default_platform in ('winddk',):
 	default_drivers = 'softpipe,i915simple,trace'
@@ -41,16 +41,16 @@ else:
 	default_drivers = 'all'
 	default_winsys = 'all'
 
-opts = Options('config.py')
+opts = Variables('config.py')
 common.AddOptions(opts)
-opts.Add(ListOption('statetrackers', 'state trackers to build', default_statetrackers,
+opts.Add(ListVariable('statetrackers', 'state trackers to build', default_statetrackers,
                      ['mesa', 'python']))
-opts.Add(ListOption('drivers', 'pipe drivers to build', default_drivers,
-                     ['softpipe', 'failover', 'i915simple', 'i965simple', 'cell', 'trace']))
-opts.Add(ListOption('winsys', 'winsys drivers to build', default_winsys,
-                     ['xlib', 'intel', 'gdi'])) 
+opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers,
+                     ['softpipe', 'failover', 'i915simple', 'i965simple', 'cell', 'trace', 'r300']))
+opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys,
+                     ['xlib', 'intel', 'gdi', 'radeon']))
 
-opts.Add(EnumOption('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))
+opts.Add(EnumVariable('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))
 
 env = Environment(
 	options = opts,
@@ -133,7 +133,7 @@ if dri:
 # LLVM
 if llvm:
 	# See also http://www.scons.org/wiki/UsingPkgConfig
-	env.ParseConfig('llvm-config --cflags --ldflags --libs')
+	env.ParseConfig('llvm-config --cflags --ldflags --libs backend bitreader engine instrumentation interpreter ipo')
 	env.Append(CPPDEFINES = ['MESA_LLVM'])
         # Force C++ linkage
 	env['LINK'] = env['CXX']
@@ -162,6 +162,6 @@ Export('env')
 
 SConscript(
 	'src/SConscript',
-	build_dir = env['build'],
+	variant_dir = env['build'],
 	duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
 )