fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 16:00:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

scons: Eliminate MSVC2008 compatibility.

Browse source 
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
This commit is contained in:
Jose Fonseca 2016-02-11 11:07:49 +00:00
parent 1cadfe08c4
commit a97a955b92
7 changed files with 6 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scons/gallium.py
View file

@ -94,16 +94,8 @@ def msvc2013_compat(env):
'-Werror=pointer-arith', '-Werror=pointer-arith',
]) ])
def msvc2008_compat(env):
msvc2013_compat(env)
if env['gcc']:
env.Append(CFLAGS = [
'-Werror=declaration-after-statement',
])
def createMSVCCompatMethods(env): def createMSVCCompatMethods(env):
env.AddMethod(msvc2013_compat, 'MSVC2013Compat') env.AddMethod(msvc2013_compat, 'MSVC2013Compat')
env.AddMethod(msvc2008_compat, 'MSVC2008Compat')
def num_jobs(): def num_jobs():
@ -479,20 +471,12 @@ def generate(env):
# See also: # See also:
# - http://msdn.microsoft.com/en-us/library/19z1t1wy.aspx # - http://msdn.microsoft.com/en-us/library/19z1t1wy.aspx
# - cl /? # - 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': if env['build'] == 'debug':
ccflags += [ ccflags += [
'/Od', # disable optimizations '/Od', # disable optimizations
'/Oi', # enable intrinsic functions '/Oi', # enable intrinsic functions
] ]
else: 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 += [ ccflags += [
'/O2', # optimize for speed '/O2', # optimize for speed
] ]

2
src/gallium/auxiliary/SConscript
View file

@ -10,7 +10,7 @@ env.Append(CPPPATH = [
env = env.Clone() env = env.Clone()
env.MSVC2008Compat() env.MSVC2013Compat()
env.CodeGenerate( env.CodeGenerate(
target = 'indices/u_indices_gen.c', target = 'indices/u_indices_gen.c',

2
src/gallium/auxiliary/pipe-loader/SConscript
View file

@ -2,7 +2,7 @@ Import('*')
env = env.Clone() env = env.Clone()
env.MSVC2008Compat() env.MSVC2013Compat()
env.Append(CPPPATH = [ env.Append(CPPPATH = [
'#/src/loader', '#/src/loader',

2
src/gallium/drivers/llvmpipe/SConscript
View file

@ -9,7 +9,7 @@ if not env['llvm']:
env = env.Clone() env = env.Clone()
env.MSVC2008Compat() env.MSVC2013Compat()
llvmpipe = env.ConvenienceLibrary( llvmpipe = env.ConvenienceLibrary(
target = 'llvmpipe', target = 'llvmpipe',

2
src/gallium/drivers/softpipe/SConscript
View file

@ -2,7 +2,7 @@ Import('*')
env = env.Clone() env = env.Clone()
env.MSVC2008Compat() env.MSVC2013Compat()
softpipe = env.ConvenienceLibrary( softpipe = env.ConvenienceLibrary(
target = 'softpipe', target = 'softpipe',

2
src/gallium/drivers/trace/SConscript
View file

@ -2,7 +2,7 @@ Import('*')
env = env.Clone() env = env.Clone()
env.MSVC2008Compat() env.MSVC2013Compat()
trace = env.ConvenienceLibrary( trace = env.ConvenienceLibrary(
target = 'trace', target = 'trace',

2
src/util/SConscript
View file

@ -6,7 +6,7 @@ from sys import executable as python_cmd
env = env.Clone() env = env.Clone()
env.MSVC2008Compat() env.MSVC2013Compat()
env.Prepend(CPPPATH = [ env.Prepend(CPPPATH = [
'#include', '#include',