Fix memory leak.

[mesa.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 7f9a2225427a5cb66f36221d407954dccb764a01..f43c10cecb3fef5eb98aff5029f5c66a4164ee36 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -32,25 +32,25 @@ import common
 default_statetrackers = 'mesa'
 
 if common.default_platform in ('linux', 'freebsd', 'darwin'):
-       default_drivers = 'softpipe,failover,i915simple,trace'
+       default_drivers = 'softpipe,failover,svga,i915,trace,identity,llvmpipe'
        default_winsys = 'xlib'
 elif common.default_platform in ('winddk',):
-       default_drivers = 'softpipe,i915simple,trace'
+       default_drivers = 'softpipe,svga,i915,trace,identity'
        default_winsys = 'all'
 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,
-                     ['mesa', 'python']))
-opts.Add(ListOption('drivers', 'pipe drivers to build', default_drivers,
-                     ['softpipe', 'failover', 'i915simple', 'i965simple', 'cell', 'trace', 'r300']))
-opts.Add(ListOption('winsys', 'winsys drivers to build', default_winsys,
-                     ['xlib', 'intel', 'gdi', 'amd']))
+opts.Add(ListVariable('statetrackers', 'state trackers to build', default_statetrackers,
+                     ['mesa', 'python', 'xorg']))
+opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers,
+                     ['softpipe', 'failover', 'svga', 'i915', 'cell', 'trace', 'r300', 'identity', 'llvmpipe']))
+opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys,
+                     ['xlib', 'vmware', '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 backend bitreader engine ipo')
+       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']