projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965/bxt: Add basic Broxton infrastructure
[mesa.git]
/
SConstruct
diff --git
a/SConstruct
b/SConstruct
index 104cc38aa638a33e767252a1fc770476a611d901..ef71ab69c3844cd0a3837f76f34d639ea460cd79 100644
(file)
--- a/
SConstruct
+++ b/
SConstruct
@@
-40,6
+40,9
@@
env = Environment(
ENV = os.environ,
)
ENV = os.environ,
)
+# XXX: This creates a many problems as it saves...
+#opts.Save('config.py', env)
+
# Backwards compatability with old target configuration variable
try:
targets = ARGUMENTS['targets']
# Backwards compatability with old target configuration variable
try:
targets = ARGUMENTS['targets']
@@
-56,16
+59,16
@@
else:
Help(opts.GenerateHelpText(env))
Help(opts.GenerateHelpText(env))
-# fail early for a common error on windows
-if env['gles']:
- try:
- import libxml2
- except ImportError:
- raise SCons.Errors.UserError, "GLES requires libxml2-python to build"
-
#######################################################################
# Environment setup
#######################################################################
# Environment setup
+with open("VERSION") as f:
+ mesa_version = f.read().strip()
+env.Append(CPPDEFINES = [
+ ('PACKAGE_VERSION', '\\"%s\\"' % mesa_version),
+ ('PACKAGE_BUGREPORT', '\\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\\"'),
+])
+
# Includes
env.Prepend(CPPPATH = [
'#/include',
# Includes
env.Prepend(CPPPATH = [
'#/include',
@@
-77,9
+80,6
@@
env.Append(CPPPATH = [
'#/src/gallium/winsys',
])
'#/src/gallium/winsys',
])
-if env['msvc']:
- env.Append(CPPPATH = ['#include/c99'])
-
# for debugging
#print env.Dump()
# for debugging
#print env.Dump()
@@
-112,9
+112,6
@@
if env['crosscompile'] and not env['embedded']:
host_env['hostonly'] = True
assert host_env['crosscompile'] == False
host_env['hostonly'] = True
assert host_env['crosscompile'] == False
- if host_env['msvc']:
- host_env.Append(CPPPATH = ['#include/c99'])
-
target_env = env
env = host_env
Export('env')
target_env = env
env = host_env
Export('env')
@@
-141,3
+138,18
@@
SConscript(
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
)
+
+########################################################################
+# List all aliases
+
+try:
+ from SCons.Node.Alias import default_ans
+except ImportError:
+ pass
+else:
+ aliases = default_ans.keys()
+ aliases.sort()
+ env.Help('\n')
+ env.Help('Recognized targets:\n')
+ for alias in aliases:
+ env.Help(' %s\n' % alias)