Part revert "gallium/auxiliary: don't build NIR sources with MSVC2008 flags"

This reverts commit 41c7912d04111a7e3b75a438c5cbbd7edc0fee25 but leaves
out the pragma [that inspired the original commit].

Building mesa requires MSVC2013 or later, thus we no longer need this.

v2: Use correct include path (src/glsl/nir -> src/compiler/nir)

Conflicts:
	src/gallium/auxiliary/Makefile.am

Acked-by: Jason Ekstrand <jason@jlekstrand.net> (v1)

diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
index 82c2869b99bf44db0aa78815e83a2af8787a9c9b..296ed59317b914ba596cd88ac768e06023271c05 100644 (file)
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -1,10 +1,11 @@
 include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
-noinst_LTLIBRARIES = libgallium_nir.la
+noinst_LTLIBRARIES = libgallium.la
 
 AM_CFLAGS = \
        -I$(top_srcdir)/src/loader \
+       -I$(top_builddir)/src/compiler/nir \
        -I$(top_srcdir)/src/gallium/auxiliary/util \
        $(GALLIUM_CFLAGS) \
        $(VISIBILITY_CFLAGS) \
@@ -14,24 +15,11 @@ AM_CXXFLAGS = \
        $(VISIBILITY_CXXFLAGS) \
        $(MSVC2013_COMPAT_CXXFLAGS)
 
-libgallium_nir_la_SOURCES = \
-       $(NIR_SOURCES)
-
-libgallium_nir_la_CFLAGS = \
-       -I$(top_builddir)/src/compiler/nir \
-       $(GALLIUM_CFLAGS) \
-       $(VISIBILITY_CFLAGS) \
-       $(MSVC2013_COMPAT_CFLAGS)
-
-noinst_LTLIBRARIES += libgallium.la
-
 libgallium_la_SOURCES = \
        $(C_SOURCES) \
+       $(NIR_SOURCES) \
        $(GENERATED_SOURCES)
 
-libgallium_la_LIBADD = \
-       libgallium_nir.la
-
 if HAVE_MESA_LLVM
 
 AM_CFLAGS += \