projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hud: s/Elements/ARRAY_SIZE/
[mesa.git]
/
SConstruct
diff --git
a/SConstruct
b/SConstruct
index 4a3fef0805942f904618ebcff889dcc41b408d0f..e2e49fcc6ca4aa93f75440517ed89f99cca6dab9 100644
(file)
--- a/
SConstruct
+++ b/
SConstruct
@@
-59,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',
@@
-80,13
+80,15
@@
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
#
@@
-115,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')