[Mesa-dev] [PATCH 06/23] targets/pipe-loader: link sw-wrapper and softpipe for svga/i915

[Emil Velikov]

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/gallium/targets/pipe-loader/Makefile.am | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am
index 3280694..68d0424 100644
--- a/src/gallium/targets/pipe-loader/Makefile.am
+++ b/src/gallium/targets/pipe-loader/Makefile.am
@@ -61,6 +61,8 @@ pipe_LTLIBRARIES += pipe_i915.la
 
 pipe_i915_la_SOURCES = pipe_i915.c
 nodist_EXTRA_pipe_i915_la_SOURCES = dummy.cpp
+
+pipe_i915_la_CPPFLAGS = $(AM_CPPFLAGS)
 pipe_i915_la_LIBADD = \
 	$(PIPE_LIBS) \
 	$(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \
@@ -68,6 +70,19 @@ pipe_i915_la_LIBADD = \
 	$(LIBDRM_LIBS) \
 	$(INTEL_LIBS)
 
+pipe_i915_la_CPPFLAGS += -DGALLIUM_SOFTPIPE
+pipe_i915_la_LIBADD += \
+	$(top_builddir)/src/gallium/winsys/sw/wrapper/libwsw.la \
+	$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la
+
+#if HAVE_GALLIUM_LLVMPIPE
+if NEED_GALLIUM_LLVMPIPE_DRIVER
+
+pipe_i915_la_CPPFLAGS += -DGALLIUM_LLVMPIPE
+pipe_i915_la_LIBADD += \
+	$(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la
+
+endif
 endif
 
 if HAVE_GALLIUM_NOUVEAU
@@ -149,29 +164,37 @@ pipe_LTLIBRARIES += pipe_vmwgfx.la
 pipe_vmwgfx_la_SOURCES = pipe_vmwgfx.c
 nodist_EXTRA_pipe_vmwgfx_la_SOURCES = dummy.cpp
 
+pipe_vmwgfx_la_CPPFLAGS = $(AM_CPPFLAGS)
 pipe_vmwgfx_la_LIBADD = \
 	$(PIPE_LIBS) \
 	$(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \
 	$(top_builddir)/src/gallium/drivers/svga/libsvga.la \
 	$(LIBDRM_LIBS)
 
+pipe_vmwgfx_la_CPPFLAGS += -DGALLIUM_SOFTPIPE
+pipe_vmwgfx_la_LIBADD += \
+	$(top_builddir)/src/gallium/winsys/sw/wrapper/libwsw.la \
+	$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la
+
 endif
 
 if HAVE_GALLIUM_SOFTPIPE
-AM_CPPFLAGS += -DGALLIUM_SOFTPIPE
-
 pipe_LTLIBRARIES += pipe_swrast.la
+
 pipe_swrast_la_SOURCES = pipe_swrast.c
 nodist_EXTRA_pipe_swrast_la_SOURCES = dummy.cpp
 
+pipe_swrast_la_CPPFLAGS = $(AM_CPPFLAGS)
+pipe_swrast_la_CPPFLAGS += -DGALLIUM_SOFTPIPE
 pipe_swrast_la_LIBADD = \
 	$(PIPE_LIBS) \
 	$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la
 
 if HAVE_GALLIUM_LLVMPIPE
-AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
 
+pipe_swrast_la_CPPFLAGS += -DGALLIUM_LLVMPIPE
 pipe_swrast_la_LIBADD += \
 	$(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la
+
 endif
 endif
-- 
1.9.2