projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r600g,radeonsi: Set RADEON_GEM_NO_CPU_ACCESS flag for tiled BOs
[mesa.git]
/
SConstruct
diff --git
a/SConstruct
b/SConstruct
index b00a7fe1c989fdf4fffa70e10f2ba8a7a292711f..ef71ab69c3844cd0a3837f76f34d639ea460cd79 100644
(file)
--- a/
SConstruct
+++ b/
SConstruct
@@
-59,18
+59,13
@@
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 = [
env.Append(CPPDEFINES = [
- ('PACKAGE_VERSION', '\\"
9.3.0-devel\\"'
),
+ ('PACKAGE_VERSION', '\\"
%s\\"' % mesa_version
),
('PACKAGE_BUGREPORT', '\\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\\"'),
])
('PACKAGE_BUGREPORT', '\\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\\"'),
])
@@
-85,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()
@@
-120,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')