svga: use the SVGA3D_DEVCAP_MAX_FRAGMENT_SHADER_INSTRUCTIONS query

[mesa.git] / src / gallium / auxiliary / Makefile.am

diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
index 0908608d2db283219a07a7441ec2417299e9ba76..296ed59317b914ba596cd88ac768e06023271c05 100644 (file)
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -1,7 +1,3 @@
-if HAVE_LOADER_GALLIUM
-SUBDIRS := pipe-loader
-endif
-
 include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
@@ -9,15 +5,15 @@ noinst_LTLIBRARIES = libgallium.la
 
 AM_CFLAGS = \
        -I$(top_srcdir)/src/loader \
-       -I$(top_builddir)/src/glsl/nir \
+       -I$(top_builddir)/src/compiler/nir \
        -I$(top_srcdir)/src/gallium/auxiliary/util \
        $(GALLIUM_CFLAGS) \
        $(VISIBILITY_CFLAGS) \
-       $(MSVC2008_COMPAT_CXXFLAGS)
+       $(MSVC2013_COMPAT_CFLAGS)
 
 AM_CXXFLAGS = \
        $(VISIBILITY_CXXFLAGS) \
-       $(MSVC2008_COMPAT_CXXFLAGS)
+       $(MSVC2013_COMPAT_CXXFLAGS)
 
 libgallium_la_SOURCES = \
        $(C_SOURCES) \
@@ -68,12 +64,6 @@ COMMON_VL_CFLAGS = \
        $(DRI2PROTO_CFLAGS) \
        $(LIBDRM_CFLAGS)
 
-if HAVE_GALLIUM_STATIC_TARGETS
-COMMON_VL_CFLAGS += \
-       -DGALLIUM_STATIC_TARGETS=1
-
-endif # HAVE_GALLIUM_STATIC_TARGETS
-
 noinst_LTLIBRARIES += libgalliumvl.la
 
 libgalliumvl_la_CFLAGS = \