scons: Eliminate MSVC2008 compatibility.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>

diff --git a/scons/gallium.py b/scons/gallium.py
index 6dcd95233c3bedb9b93931298d84b79474cd631f..46520168a02fe96694bc1290b97966e5b466bc4f 100755 (executable)
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -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
             ]

diff --git a/src/gallium/auxiliary/SConscript b/src/gallium/auxiliary/SConscript
index d5fa880c7f2ae81b73d00680997ccaf7d7d927af..3d83d4467b41ac33bb4b9a6b7d48ed360aaa97e5 100644 (file)
--- a/src/gallium/auxiliary/SConscript
+++ b/src/gallium/auxiliary/SConscript
@@ -10,7 +10,7 @@ env.Append(CPPPATH = [
 
 env = env.Clone()
 
-env.MSVC2008Compat()
+env.MSVC2013Compat()
 
 env.CodeGenerate(
     target = 'indices/u_indices_gen.c', 

diff --git a/src/gallium/auxiliary/pipe-loader/SConscript b/src/gallium/auxiliary/pipe-loader/SConscript
index c611fb892f8108f486188c6173c33e15b2ee3a16..14e1b350aea8fe79807bee1861303533694db0ec 100644 (file)
--- a/src/gallium/auxiliary/pipe-loader/SConscript
+++ b/src/gallium/auxiliary/pipe-loader/SConscript
@@ -2,7 +2,7 @@ Import('*')
 
 env = env.Clone()
 
-env.MSVC2008Compat()
+env.MSVC2013Compat()
 
 env.Append(CPPPATH = [
     '#/src/loader',

diff --git a/src/gallium/drivers/llvmpipe/SConscript b/src/gallium/drivers/llvmpipe/SConscript
index 3a51efcd5069fe967a459760dcd77679d736f475..11cc3bcc858ef62a44cabc839df6afaff97daf31 100644 (file)
--- a/src/gallium/drivers/llvmpipe/SConscript
+++ b/src/gallium/drivers/llvmpipe/SConscript
@@ -9,7 +9,7 @@ if not env['llvm']:
 
 env = env.Clone()
 
-env.MSVC2008Compat()
+env.MSVC2013Compat()
 
 llvmpipe = env.ConvenienceLibrary(
        target = 'llvmpipe',

diff --git a/src/gallium/drivers/softpipe/SConscript b/src/gallium/drivers/softpipe/SConscript
index dc3542c51004b325ac15f6f0be53b28a026acb2e..8ae53b676ce089a017567257c168a18bae6e9bb1 100644 (file)
--- a/src/gallium/drivers/softpipe/SConscript
+++ b/src/gallium/drivers/softpipe/SConscript
@@ -2,7 +2,7 @@ Import('*')
 
 env = env.Clone()
 
-env.MSVC2008Compat()
+env.MSVC2013Compat()
 
 softpipe = env.ConvenienceLibrary(
        target = 'softpipe',

diff --git a/src/gallium/drivers/trace/SConscript b/src/gallium/drivers/trace/SConscript
index 1bbed73903dd8488ad72160be5071e720bba9eaa..7397983647aa0e9728aa6be3286c6168e87fe285 100644 (file)
--- a/src/gallium/drivers/trace/SConscript
+++ b/src/gallium/drivers/trace/SConscript
@@ -2,7 +2,7 @@ Import('*')
 
 env = env.Clone()
 
-env.MSVC2008Compat()
+env.MSVC2013Compat()
 
 trace = env.ConvenienceLibrary(
     target = 'trace',

diff --git a/src/util/SConscript b/src/util/SConscript
index 3dbe70a2e8a3596b348cb9245f415113361e842e..5f3ecc1cdfce99714f0bbd629c94938f356191e1 100644 (file)
--- a/src/util/SConscript
+++ b/src/util/SConscript
@@ -6,7 +6,7 @@ from sys import executable as python_cmd
 
 env = env.Clone()
 
-env.MSVC2008Compat()
+env.MSVC2013Compat()
 
 env.Prepend(CPPPATH = [
     '#include',