Merge branch '7.8'

[mesa.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 76ab9025e23e44a1c69746f7e44a790de33453af..5d44b6efde625f73ed9d104562c461f861f99cc9 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -52,7 +52,7 @@ opts.Add(ListVariable('statetrackers', 'state trackers to build', default_statet
 opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers,
                      ['softpipe', 'failover', 'svga', 'i915', 'i965', 'trace', 'r300', 'identity', 'llvmpipe']))
 opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys,
-                     ['xlib', 'vmware', 'intel', 'i965', 'gdi', 'radeon']))
+                     ['xlib', 'vmware', 'i915', 'i965', 'gdi', 'radeon', 'graw-xlib']))
 
 opts.Add(EnumVariable('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))
 
@@ -83,6 +83,11 @@ machine = env['machine']
 platform = env['platform']
 drawllvm = 'llvmpipe' in env['drivers']
 
+# LLVM support in the Draw module
+if drawllvm:
+        env.Tool('llvm')
+        if not env.has_key('LLVM_VERSION'):
+           drawllvm = False
 
 # derived options
 x86 = machine == 'x86'
@@ -105,12 +110,19 @@ Export([
 #######################################################################
 # Environment setup
 
+# Always build trace and identity drivers
+if 'trace' not in env['drivers']:
+    env['drivers'].append('trace')
+if 'identity' not in env['drivers']:
+    env['drivers'].append('identity')
+
 # Includes
 env.Append(CPPPATH = [
        '#/include',
        '#/src/gallium/include',
        '#/src/gallium/auxiliary',
        '#/src/gallium/drivers',
+       '#/src/gallium/winsys',
 ])
 
 if env['msvc']:
@@ -168,10 +180,7 @@ if dri:
 
 # LLVM support in the Draw module
 if drawllvm:
-       # See also http://www.scons.org/wiki/UsingPkgConfig
-        # currently  --ldflags --libsdisabled since the driver will force the correct linkage
-       env.ParseConfig('llvm-config --cflags backend bitreader engine instrumentation interpreter ipo')
-       env.Append(CPPDEFINES = ['DRAW_LLVM'])
+    env.Append(CPPDEFINES = ['DRAW_LLVM'])
 
 # libGL
 if platform in ('linux', 'freebsd', 'darwin'):
@@ -223,8 +232,10 @@ SConscript(
        duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
 )
 
+env.Default('src')
+
 SConscript(
-       'progs/SConscript',
-       variant_dir = os.path.join('progs', env['build']),
-       duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
+    'progs/SConscript',
+    variant_dir = os.path.join('progs', env['build']),
+    duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
 )