diff options
| author | Jason Ekstrand <[email protected]> | 2016-02-11 15:09:30 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-02-11 15:09:30 -0800 |
| commit | ff8895ba5606372f368917b97b8c4380bb822234 (patch) | |
| tree | 4f4387c154e1988e1005237187ba1bee661b5bd7 /src/util | |
| parent | 2009e304f7c0bdf5bf01b8dd60dddc2f8bb25f18 (diff) | |
| parent | 9f8c01b03c168f6cf7aa12046be73e0fc46940c6 (diff) | |
Merge remote-tracking branch 'mesa-public/master' into vulkan
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/Makefile.am | 2 | ||||
| -rw-r--r-- | src/util/SConscript | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index e05a2c5958c..093589163ba 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -38,7 +38,7 @@ libmesautil_la_CPPFLAGS = \ -I$(top_srcdir)/src/gallium/auxiliary \ $(SHA1_CFLAGS) \ $(VISIBILITY_CFLAGS) \ - $(MSVC2008_COMPAT_CFLAGS) + $(MSVC2013_COMPAT_CFLAGS) libmesautil_la_SOURCES = \ $(MESA_UTIL_FILES) \ diff --git a/src/util/SConscript b/src/util/SConscript index 3dbe70a2e8a..5f3ecc1cdfc 100644 --- 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', |