scons: Eliminate MSVC2008 compatibility.
Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Roland Scheidegger <sroland@vmware.com>
This commit is contained in:
@@ -94,16 +94,8 @@ def msvc2013_compat(env):
|
||||
'-Werror=pointer-arith',
|
||||
])
|
||||
|
||||
def msvc2008_compat(env):
|
||||
msvc2013_compat(env)
|
||||
if env['gcc']:
|
||||
env.Append(CFLAGS = [
|
||||
'-Werror=declaration-after-statement',
|
||||
])
|
||||
|
||||
def createMSVCCompatMethods(env):
|
||||
env.AddMethod(msvc2013_compat, 'MSVC2013Compat')
|
||||
env.AddMethod(msvc2008_compat, 'MSVC2008Compat')
|
||||
|
||||
|
||||
def num_jobs():
|
||||
@@ -479,20 +471,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
|
||||
'/Oi', # enable intrinsic functions
|
||||
]
|
||||
else:
|
||||
if 'MSVC_VERSION' in env and distutils.version.LooseVersion(env['MSVC_VERSION']) < distutils.version.LooseVersion('11.0'):
|
||||
print 'scons: warning: Visual Studio versions prior to 2012 are known to produce incorrect code when optimizations are enabled ( https://bugs.freedesktop.org/show_bug.cgi?id=58718 )'
|
||||
ccflags += [
|
||||
'/O2', # optimize for speed
|
||||
]
|
||||
|
@@ -10,7 +10,7 @@ env.Append(CPPPATH = [
|
||||
|
||||
env = env.Clone()
|
||||
|
||||
env.MSVC2008Compat()
|
||||
env.MSVC2013Compat()
|
||||
|
||||
env.CodeGenerate(
|
||||
target = 'indices/u_indices_gen.c',
|
||||
|
@@ -2,7 +2,7 @@ Import('*')
|
||||
|
||||
env = env.Clone()
|
||||
|
||||
env.MSVC2008Compat()
|
||||
env.MSVC2013Compat()
|
||||
|
||||
env.Append(CPPPATH = [
|
||||
'#/src/loader',
|
||||
|
@@ -9,7 +9,7 @@ if not env['llvm']:
|
||||
|
||||
env = env.Clone()
|
||||
|
||||
env.MSVC2008Compat()
|
||||
env.MSVC2013Compat()
|
||||
|
||||
llvmpipe = env.ConvenienceLibrary(
|
||||
target = 'llvmpipe',
|
||||
|
@@ -2,7 +2,7 @@ Import('*')
|
||||
|
||||
env = env.Clone()
|
||||
|
||||
env.MSVC2008Compat()
|
||||
env.MSVC2013Compat()
|
||||
|
||||
softpipe = env.ConvenienceLibrary(
|
||||
target = 'softpipe',
|
||||
|
@@ -2,7 +2,7 @@ Import('*')
|
||||
|
||||
env = env.Clone()
|
||||
|
||||
env.MSVC2008Compat()
|
||||
env.MSVC2013Compat()
|
||||
|
||||
trace = env.ConvenienceLibrary(
|
||||
target = 'trace',
|
||||
|
@@ -6,7 +6,7 @@ from sys import executable as python_cmd
|
||||
|
||||
env = env.Clone()
|
||||
|
||||
env.MSVC2008Compat()
|
||||
env.MSVC2013Compat()
|
||||
|
||||
env.Prepend(CPPPATH = [
|
||||
'#include',
|
||||
|
Reference in New Issue
Block a user