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/gallium/auxiliary/Makefile.am | |
| parent | 2009e304f7c0bdf5bf01b8dd60dddc2f8bb25f18 (diff) | |
| parent | 9f8c01b03c168f6cf7aa12046be73e0fc46940c6 (diff) | |
Merge remote-tracking branch 'mesa-public/master' into vulkan
Diffstat (limited to 'src/gallium/auxiliary/Makefile.am')
| -rw-r--r-- | src/gallium/auxiliary/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am index 0ac5c9802f2..82c2869b99b 100644 --- a/src/gallium/auxiliary/Makefile.am +++ b/src/gallium/auxiliary/Makefile.am @@ -8,11 +8,11 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/gallium/auxiliary/util \ $(GALLIUM_CFLAGS) \ $(VISIBILITY_CFLAGS) \ - $(MSVC2008_COMPAT_CFLAGS) + $(MSVC2013_COMPAT_CFLAGS) AM_CXXFLAGS = \ $(VISIBILITY_CXXFLAGS) \ - $(MSVC2008_COMPAT_CXXFLAGS) + $(MSVC2013_COMPAT_CXXFLAGS) libgallium_nir_la_SOURCES = \ $(NIR_SOURCES) |