projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glsl2: Don't dereference a NULL var in CE handling during a compile error.
[mesa.git]
/
SConstruct
diff --git
a/SConstruct
b/SConstruct
index c843b41b0dc933c6f7562a13108d29933a053612..a187d8d1b6faba6e4cf77bb0a3f87880c1e73714 100644
(file)
--- a/
SConstruct
+++ b/
SConstruct
@@
-31,7
+31,7
@@
import common
# Configuration options
default_statetrackers = 'mesa'
# Configuration options
default_statetrackers = 'mesa'
-default_targets = '
none
'
+default_targets = '
graw-null
'
if common.default_platform in ('linux', 'freebsd', 'darwin'):
default_drivers = 'softpipe,failover,svga,i915,i965,trace,identity,llvmpipe'
if common.default_platform in ('linux', 'freebsd', 'darwin'):
default_drivers = 'softpipe,failover,svga,i915,i965,trace,identity,llvmpipe'
@@
-49,11
+49,11
@@
else:
opts = Variables('config.py')
common.AddOptions(opts)
opts.Add(ListVariable('statetrackers', 'state trackers to build', default_statetrackers,
opts = Variables('config.py')
common.AddOptions(opts)
opts.Add(ListVariable('statetrackers', 'state trackers to build', default_statetrackers,
- ['mesa', 'python', 'xorg']))
+ ['mesa', 'python', 'xorg'
, 'egl'
]))
opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers,
opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers,
- ['softpipe', 'failover', 'svga', 'i915', 'i965', 'trace', 'r300', 'identity', 'llvmpipe', 'nouveau', 'nv50', 'nvfx']))
+ ['softpipe', 'failover', 'svga', 'i915', 'i965', 'trace', 'r300', '
r600', '
identity', 'llvmpipe', 'nouveau', 'nv50', 'nvfx']))
opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys,
opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys,
- ['xlib', 'vmware', 'i915', 'i965', 'gdi', 'radeon', 'graw-xlib']))
+ ['xlib', 'vmware', 'i915', 'i965', 'gdi', 'radeon', '
r600', '
graw-xlib']))
opts.Add(ListVariable('targets', 'driver targets to build', default_targets,
['dri-i915',
opts.Add(ListVariable('targets', 'driver targets to build', default_targets,
['dri-i915',
@@
-69,6
+69,7
@@
opts.Add(ListVariable('targets', 'driver targets to build', default_targets,
'egl-swrast',
'egl-vmwgfx',
'graw-xlib',
'egl-swrast',
'egl-vmwgfx',
'graw-xlib',
+ 'graw-null',
'libgl-gdi',
'libgl-xlib',
'xorg-i915',
'libgl-gdi',
'libgl-xlib',
'xorg-i915',
@@
-130,12
+131,16
@@
if 'trace' not in env['drivers']:
env['drivers'].append('trace')
if 'rbug' not in env['drivers']:
env['drivers'].append('rbug')
env['drivers'].append('trace')
if 'rbug' not in env['drivers']:
env['drivers'].append('rbug')
+if 'galahad' not in env['drivers']:
+ env['drivers'].append('galahad')
if 'identity' not in env['drivers']:
env['drivers'].append('identity')
if 'softpipe' not in env['drivers']:
env['drivers'].append('softpipe')
if env['llvm'] and 'llvmpipe' not in env['drivers']:
env['drivers'].append('llvmpipe')
if 'identity' not in env['drivers']:
env['drivers'].append('identity')
if 'softpipe' not in env['drivers']:
env['drivers'].append('softpipe')
if env['llvm'] and 'llvmpipe' not in env['drivers']:
env['drivers'].append('llvmpipe')
+if 'sw' not in env['drivers']:
+ env['drivers'].append('sw')
# Includes
env.Prepend(CPPPATH = [
# Includes
env.Prepend(CPPPATH = [
@@
-231,8
+236,3
@@
SConscript(
env.Default('src')
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
-)