From 0f39f9cb7ad8e93cfad95043724143ed097de966 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 13 Oct 2015 18:07:11 +0100 Subject: [PATCH] pipe-loader: add a dummy 'static' pipe-loader It is to be used in contrast of the dynamic one. The state-tracker does not need to know if the pipe-driver is built into the final blob or a separate object. This will allow us to move the logic to the final step (in target) where the appropriate pipe-loader will be chosen. Cc: Tom Stellard Cc: Francisco Jerez Signed-off-by: Emil Velikov Acked-by: Rob Clark --- src/gallium/auxiliary/pipe-loader/Makefile.am | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/src/gallium/auxiliary/pipe-loader/Makefile.am b/src/gallium/auxiliary/pipe-loader/Makefile.am index 974cf08..6a4a667 100644 --- a/src/gallium/auxiliary/pipe-loader/Makefile.am +++ b/src/gallium/auxiliary/pipe-loader/Makefile.am @@ -5,12 +5,24 @@ include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ -I$(top_srcdir)/src/loader \ -I$(top_srcdir)/src/gallium/winsys \ - -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" \ $(GALLIUM_PIPE_LOADER_DEFINES) \ $(GALLIUM_CFLAGS) \ $(VISIBILITY_CFLAGS) -noinst_LTLIBRARIES = libpipe_loader_dynamic.la +noinst_LTLIBRARIES = \ + libpipe_loader_static.la \ + libpipe_loader_dynamic.la + +libpipe_loader_static_la_CFLAGS = \ + $(AM_CFLAGS) \ + -DGALLIUM_STATIC_TARGETS=1 + +libpipe_loader_dynamic_la_CFLAGS = \ + $(AM_CFLAGS) \ + -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" + +libpipe_loader_static_la_SOURCES = \ + $(COMMON_SOURCES) libpipe_loader_dynamic_la_SOURCES = \ $(COMMON_SOURCES) @@ -19,11 +31,16 @@ if HAVE_LIBDRM AM_CFLAGS += \ $(LIBDRM_CFLAGS) +libpipe_loader_static_la_SOURCES += \ + $(DRM_SOURCES) + libpipe_loader_dynamic_la_SOURCES += \ $(DRM_SOURCES) +libpipe_loader_static_la_LIBADD = \ + $(top_builddir)/src/loader/libloader.la + libpipe_loader_dynamic_la_LIBADD = \ $(top_builddir)/src/loader/libloader.la endif - -- 2.7.4