diff options
| author | Emil Velikov <[email protected]> | 2014-06-21 12:50:10 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-07-10 01:06:49 +0100 |
| commit | 0bdc3e1afda111c5741a699da3ff891fedfe89de (patch) | |
| tree | 45b059e54c82c58a9e19a5ff6bc76530c91520c5 /src/gallium/targets/dri/Makefile.am | |
| parent | 29ca7d2c9488d13e496ec65b6e1e1bf1d53042c5 (diff) | |
targets/dri-swrast: Convert to static/shared pipe-driver
Convert the final dri target to the single DRI (megadriver) library.
Cleanup all the automake leftovers from the conversion stage and
update the scons build.
v2: Link in llvmpipe, when applicable.
Signed-off-by: Emil Velikov <[email protected]>
Tested-by: Rob Clark <[email protected]>
Tested-by: Thomas Helland <thomashelland90 at gmail.com>
Acked-by: Tom Stellard <[email protected]>
Diffstat (limited to 'src/gallium/targets/dri/Makefile.am')
| -rw-r--r-- | src/gallium/targets/dri/Makefile.am | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index 4da3e71d6af..61d6bc7aa3e 100644 --- a/src/gallium/targets/dri/Makefile.am +++ b/src/gallium/targets/dri/Makefile.am @@ -140,6 +140,20 @@ STATIC_TARGET_LIB_DEPS += \ endif +if HAVE_GALLIUM_SOFTPIPE +MEGADRIVERS += swrast +STATIC_TARGET_CPPFLAGS += -DGALLIUM_SOFTPIPE +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \ + $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la +endif + +if NEED_GALLIUM_LLVMPIPE_DRIVER +STATIC_TARGET_CPPFLAGS += -DGALLIUM_LLVMPIPE +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la +endif + gallium_dri_la_SOURCES += target.c AM_CPPFLAGS += $(STATIC_TARGET_CPPFLAGS) gallium_dri_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) |