diff options
| author | Jose Fonseca <jfonseca@vmware.com> | 2015-03-04 14:23:52 +0000 |
|---|---|---|
| committer | Jose Fonseca <jfonseca@vmware.com> | 2015-03-04 15:12:06 +0000 |
| commit | 00faf9f00059370bc20ebeaf00884c2d8ef15a74 (patch) | |
| tree | 413ad99d58123d206e133e1bd455b0cf94f6cf57 /src | |
| parent | 3acd7a34ab05b87521b74f626ec637e7fdcc6595 (diff) | |
| download | external_mesa3d-00faf9f00059370bc20ebeaf00884c2d8ef15a74.zip external_mesa3d-00faf9f00059370bc20ebeaf00884c2d8ef15a74.tar.gz external_mesa3d-00faf9f00059370bc20ebeaf00884c2d8ef15a74.tar.bz2 | |
scons: Use -Werror MSVC compatibility flags per-directory.
Matching what we already do with autotools builds.
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/egl/main/SConscript | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/SConscript | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/SConscript | 2 | ||||
| -rw-r--r-- | src/glsl/SConscript | 2 | ||||
| -rw-r--r-- | src/loader/SConscript | 2 | ||||
| -rw-r--r-- | src/mapi/glapi/SConscript | 2 | ||||
| -rw-r--r-- | src/mesa/SConscript | 2 | ||||
| -rw-r--r-- | src/util/SConscript | 2 |
8 files changed, 18 insertions, 0 deletions
diff --git a/src/egl/main/SConscript b/src/egl/main/SConscript index 399c020..b4e9b67 100644 --- a/src/egl/main/SConscript +++ b/src/egl/main/SConscript @@ -6,6 +6,8 @@ Import('*') env = env.Clone() +env.MSVC2013Compat() + env.Append(CPPDEFINES = [ '_EGL_DRIVER_SEARCH_DIR=\\"\\"', ]) diff --git a/src/gallium/auxiliary/SConscript b/src/gallium/auxiliary/SConscript index 6cb6b8c..d5fa880 100644 --- a/src/gallium/auxiliary/SConscript +++ b/src/gallium/auxiliary/SConscript @@ -8,6 +8,10 @@ env.Append(CPPPATH = [ 'util', ]) +env = env.Clone() + +env.MSVC2008Compat() + env.CodeGenerate( target = 'indices/u_indices_gen.c', script = 'indices/u_indices_gen.py', diff --git a/src/gallium/drivers/llvmpipe/SConscript b/src/gallium/drivers/llvmpipe/SConscript index 1bea611..3a51efc 100644 --- a/src/gallium/drivers/llvmpipe/SConscript +++ b/src/gallium/drivers/llvmpipe/SConscript @@ -9,6 +9,8 @@ if not env['llvm']: env = env.Clone() +env.MSVC2008Compat() + llvmpipe = env.ConvenienceLibrary( target = 'llvmpipe', source = env.ParseSourceList('Makefile.sources', 'C_SOURCES') diff --git a/src/glsl/SConscript b/src/glsl/SConscript index 21c8266..26de455 100644 --- a/src/glsl/SConscript +++ b/src/glsl/SConscript @@ -6,6 +6,8 @@ from sys import executable as python_cmd env = env.Clone() +env.MSVC2013Compat() + env.Prepend(CPPPATH = [ '#include', '#src', diff --git a/src/loader/SConscript b/src/loader/SConscript index 359fc18..16d1053 100644 --- a/src/loader/SConscript +++ b/src/loader/SConscript @@ -2,6 +2,8 @@ Import('*') env = env.Clone() +env.MSVC2013Compat() + env.Prepend(CPPPATH = [ '#include' ]) diff --git a/src/mapi/glapi/SConscript b/src/mapi/glapi/SConscript index 97ebfe6..84a5068 100644 --- a/src/mapi/glapi/SConscript +++ b/src/mapi/glapi/SConscript @@ -8,6 +8,8 @@ Import('*') env = env.Clone() +env.MSVC2013Compat() + env.Append(CPPDEFINES = [ 'MAPI_MODE_UTIL', ]) diff --git a/src/mesa/SConscript b/src/mesa/SConscript index 62e81ce..d6ff083 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -10,6 +10,8 @@ from sys import executable as python_cmd env = env.Clone() +env.MSVC2013Compat() + env.Append(CPPPATH = [ '#/src', '#/src/mapi', diff --git a/src/util/SConscript b/src/util/SConscript index 84bd7a1..9e4d481 100644 --- a/src/util/SConscript +++ b/src/util/SConscript @@ -6,6 +6,8 @@ from sys import executable as python_cmd env = env.Clone() +env.MSVC2008Compat() + env.Prepend(CPPPATH = [ '#include', '#src', |