projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
docs: avoid overwrite of LD_LIBRARY_PATH during basic testing
[mesa.git]
/
SConstruct
diff --git
a/SConstruct
b/SConstruct
index 029daa1c6f35f57c2981c652e2ba13550e4e11ec..696718c8eb445341d714094c9f8c09a19fa35fa8 100644
(file)
--- a/
SConstruct
+++ b/
SConstruct
@@
-1,7
+1,7
@@
#######################################################################
# Top-level SConstruct
#
#######################################################################
# Top-level SConstruct
#
-# For example, invoke scons as
+# For example, invoke scons as
#
# scons build=debug llvm=yes machine=x86
#
#
# scons build=debug llvm=yes machine=x86
#
@@
-12,13
+12,13
@@
# build='debug'
# llvm=True
# machine='x86'
# build='debug'
# llvm=True
# machine='x86'
-#
+#
# Invoke
#
# scons -h
#
# to get the full list of options. See scons manpage for more info.
# Invoke
#
# scons -h
#
# to get the full list of options. See scons manpage for more info.
-#
+#
import os
import os.path
import os
import os.path
@@
-36,11
+36,12
@@
common.AddOptions(opts)
env = Environment(
options = opts,
tools = ['gallium'],
env = Environment(
options = opts,
tools = ['gallium'],
- toolpath = ['#scons'],
+ toolpath = ['#scons'],
ENV = os.environ,
)
ENV = os.environ,
)
-opts.Save('config.py', env)
+# XXX: This creates a many problems as it saves...
+#opts.Save('config.py', env)
# Backwards compatability with old target configuration variable
try:
# Backwards compatability with old target configuration variable
try:
@@
-52,22
+53,22
@@
else:
print 'scons: warning: targets option is deprecated; pass the targets on their own such as'
print
print ' scons %s' % ' '.join(targets)
print 'scons: warning: targets option is deprecated; pass the targets on their own such as'
print
print ' scons %s' % ' '.join(targets)
- print
+ print
COMMAND_LINE_TARGETS.append(targets)
Help(opts.GenerateHelpText(env))
COMMAND_LINE_TARGETS.append(targets)
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',
@@
-79,16
+80,18
@@
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()
+# Add a check target for running tests
+check = env.Alias('check')
+env.AlwaysBuild(check)
+
+
#######################################################################
#######################################################################
-# Invoke host SConscripts
-#
+# Invoke host SConscripts
+#
# For things that are meant to be run on the native host build machine, instead
# of the target machine.
#
# For things that are meant to be run on the native host build machine, instead
# of the target machine.
#
@@
-114,9
+117,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')