nir: Merge redudant integer clamping.

[mesa.git] / scons / gallium.py

diff --git a/scons/gallium.py b/scons/gallium.py
index b4df1451f20c3291bad2c87f7e0f81cbd533a911..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():
@@ -300,6 +292,7 @@ def generate(env):
 
     # C preprocessor options
     cppdefines = []
+    cppdefines += ['__STDC_LIMIT_MACROS', '__STDC_CONSTANT_MACROS']
     if env['build'] in ('debug', 'checked'):
         cppdefines += ['DEBUG']
     else:
@@ -478,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
             ]
@@ -509,6 +494,7 @@ def generate(env):
             '/wd4018', # signed/unsigned mismatch
             '/wd4056', # overflow in floating-point constant arithmetic
             '/wd4244', # conversion from 'type1' to 'type2', possible loss of data
+            '/wd4267', # 'var' : conversion from 'size_t' to 'type', possible loss of data
             '/wd4305', # truncation from 'type1' to 'type2'
             '/wd4351', # new behavior: elements of array 'array' will be default initialized
             '/wd4756', # overflow in constant arithmetic
@@ -548,6 +534,7 @@ def generate(env):
             env.Append(CCFLAGS = [
                 '/analyze',
                 #'/analyze:log', '${TARGET.base}.xml',
+                '/wd28251', # Inconsistent annotation for function
             ])
         if env['clang']:
             # scan-build will produce more comprehensive output