Mesa (master): scons: Don't use bundled C99 headers for VS 2013.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Fri May 2 21:06:31 UTC 2014
Module: Mesa
Branch: master
Commit: 979692a52aec5d3c927f77f2602e9d848136e7ac
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=979692a52aec5d3c927f77f2602e9d848136e7ac
Author: José Fonseca <jfonseca at vmware.com>
Date: Thu May 1 14:19:13 2014 +0100
scons: Don't use bundled C99 headers for VS 2013.
Use the ones provided by the compiler instead.
NOTE: External trees should be updated to not include '#include/c99'
directory directly, but rather rely on scons/gallium.py to do the right
thing.
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Roland Scheidegger <sroland at vmware.com>
---
SConstruct | 6 ------
scons/gallium.py | 6 ++++++
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/SConstruct b/SConstruct
index 0e10818..ef71ab6 100644
--- a/SConstruct
+++ b/SConstruct
@@ -80,9 +80,6 @@ env.Append(CPPPATH = [
'#/src/gallium/winsys',
])
-if env['msvc']:
- env.Append(CPPPATH = ['#include/c99'])
-
# for debugging
#print env.Dump()
@@ -115,9 +112,6 @@ if env['crosscompile'] and not env['embedded']:
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')
diff --git a/scons/gallium.py b/scons/gallium.py
index ca317b0..5109ebf 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -433,6 +433,12 @@ def generate(env):
# See also:
# - http://msdn.microsoft.com/en-us/library/19z1t1wy.aspx
# - cl /?
+ if 'MSVC_VERSION' not in env or distutils.version.LooseVersion(env['MSVC_VERSION']) < distutils.version.LooseVersion('12.0'):
+ # Use bundled stdbool.h and stdint.h headers for older MSVC
+ # versions. stdint.h was introduced in MSVC 2010, but stdbool.h
+ # was only introduced in MSVC 2013.
+ top_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
+ env.Append(CPPPATH = [os.path.join(top_dir, 'include/c99')])
if env['build'] == 'debug':
ccflags += [
'/Od', # disable optimizations
More information about the mesa-commit
mailing list