radeonsi: move sampler descriptors from IB to memory

[mesa.git] / src / gallium / Automake.inc

diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index 86e9b1e20273c31e9e214cea0a7f7618f5b62c88..73d65a4d10fecc57c6aba563c46ce5cc798ff335 100644 (file)
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -26,8 +26,9 @@ GALLIUM_DRIVER_CXXFLAGS = \
        $(DEFINES) \
        $(VISIBILITY_CXXFLAGS)
 
-GALLIUM_VIDEO_CFLAGS = \
+GALLIUM_TARGET_CFLAGS = \
        -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src/loader \
        -I$(top_srcdir)/src/gallium/include \
        -I$(top_srcdir)/src/gallium/auxiliary \
        -I$(top_srcdir)/src/gallium/drivers \
@@ -37,16 +38,31 @@ GALLIUM_VIDEO_CFLAGS = \
        $(LIBDRM_CFLAGS) \
        $(VISIBILITY_CFLAGS)
 
-GALLIUM_VDPAU_LINKER_FLAGS = \
-       -module \
-       -version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \
-       -export-symbols-regex $(VDPAU_EXPORTS) \
-       -shared \
-       -no-undefined
-
-GALLIUM_VDPAU_LIB_DEPS = \
-       $(top_builddir)/src/gallium/auxiliary/libgallium.la \
-       $(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \
-       $(VDPAU_LIBS) \
-       $(LIBDRM_LIBS)
+GALLIUM_COMMON_LIB_DEPS = \
+       -lm \
+       $(CLOCK_LIB) \
+       $(PTHREAD_LIBS) \
+       $(DLOPEN_LIBS)
 
+GALLIUM_WINSYS_CFLAGS = \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src/gallium/include \
+       -I$(top_srcdir)/src/gallium/auxiliary \
+       $(DEFINES) \
+       $(VISIBILITY_CFLAGS)
+
+
+GALLIUM_PIPE_LOADER_WINSYS_LIBS = \
+       $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la
+
+if HAVE_DRISW
+GALLIUM_PIPE_LOADER_WINSYS_LIBS += \
+       $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la
+endif
+
+if NEED_WINSYS_XLIB
+GALLIUM_PIPE_LOADER_WINSYS_LIBS += \
+       $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \
+       -lX11 -lXext -lXfixes \
+       $(LIBDRM_LIBS)
+endif