projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965: fix cube map lock-up / corruption
[mesa.git]
/
SConstruct
diff --git
a/SConstruct
b/SConstruct
index fe27ceafe7b8bf90a7ecaf5a137d87dd99f23ec9..7e7f51516e8453c1903fe0b37a4919491ffb745b 100644
(file)
--- a/
SConstruct
+++ b/
SConstruct
@@
-32,10
+32,10
@@
import common
default_statetrackers = 'mesa'
if common.default_platform in ('linux', 'freebsd', 'darwin'):
default_statetrackers = 'mesa'
if common.default_platform in ('linux', 'freebsd', 'darwin'):
- default_drivers = 'softpipe,failover,i915simple,
i965simpl
e'
+ default_drivers = 'softpipe,failover,i915simple,
trac
e'
default_winsys = 'xlib'
elif common.default_platform in ('winddk',):
default_winsys = 'xlib'
elif common.default_platform in ('winddk',):
- default_drivers = 'softpipe,i915simple'
+ default_drivers = 'softpipe,i915simple
,trace
'
default_winsys = 'all'
else:
default_drivers = 'all'
default_winsys = 'all'
else:
default_drivers = 'all'
@@
-46,9
+46,11
@@
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,
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']))
+ ['softpipe', 'failover', 'i915simple', 'i965simple', 'cell'
, 'trace', 'r300'
]))
opts.Add(ListOption('winsys', 'winsys drivers to build', default_winsys,
opts.Add(ListOption('winsys', 'winsys drivers to build', default_winsys,
- ['xlib', 'intel', 'gdi']))
+ ['xlib', 'intel', 'gdi', 'amd']))
+
+opts.Add(EnumOption('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))
env = Environment(
options = opts,
env = Environment(
options = opts,
@@
-68,12
+70,14
@@
platform = env['platform']
# derived options
x86 = machine == 'x86'
# derived options
x86 = machine == 'x86'
+ppc = machine == 'ppc'
gcc = platform in ('linux', 'freebsd', 'darwin')
msvc = platform in ('windows', 'winddk')
Export([
'debug',
'x86',
gcc = platform in ('linux', 'freebsd', 'darwin')
msvc = platform in ('windows', 'winddk')
Export([
'debug',
'x86',
+ 'ppc',
'dri',
'llvm',
'platform',
'dri',
'llvm',
'platform',
@@
-129,7
+133,7
@@
if dri:
# LLVM
if llvm:
# See also http://www.scons.org/wiki/UsingPkgConfig
# 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']
env.Append(CPPDEFINES = ['MESA_LLVM'])
# Force C++ linkage
env['LINK'] = env['CXX']
@@
-158,6
+162,6
@@
Export('env')
SConscript(
'src/SConscript',
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
)
duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
)