gallium: Handle non-NULL data pointer in EXA ModifyPixmapHeader hook.

[mesa.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 7f9a2225427a5cb66f36221d407954dccb764a01..1e5fd71adcebb588462f520910d90bc983b6ac4d 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -48,7 +48,7 @@ opts.Add(ListOption('statetrackers', 'state trackers to build', default_statetra
 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']))
+                     ['xlib', 'intel', 'gdi', 'radeon']))
 
 opts.Add(EnumOption('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))
 
@@ -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']