From 7bb193d28c4195b5c3dd7897e6c9f5b0df2749cb Mon Sep 17 00:00:00 2001 From: Tim Rowley Date: Wed, 24 Feb 2016 20:56:38 -0600 Subject: mesa/build: add OpenSWR to build Tested on Linux (centos, ubuntu, and suse variants) Reviewed-by: Emil Velikov Acked-by: Jose Fonseca --- src/gallium/targets/libgl-xlib/Makefile.am | 5 +++++ src/gallium/targets/osmesa/Makefile.am | 6 ++++++ 2 files changed, 11 insertions(+) (limited to 'src/gallium/targets') diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am index d99caae3cb0..3f1382e2848 100644 --- a/src/gallium/targets/libgl-xlib/Makefile.am +++ b/src/gallium/targets/libgl-xlib/Makefile.am @@ -81,6 +81,11 @@ AM_CPPFLAGS += -DGALLIUM_LLVMPIPE lib@GL_LIB@_la_LDFLAGS += $(LLVM_LDFLAGS) endif +if HAVE_GALLIUM_SWR +lib@GL_LIB@_la_LIBADD += $(top_builddir)/src/gallium/drivers/swr/libmesaswr.la $(LLVM_LIBS) +AM_CPPFLAGS += -DGALLIUM_SWR +endif + EXTRA_lib@GL_LIB@_la_DEPENDENCIES = libgl-xlib.sym EXTRA_DIST = SConscript libgl-xlib.sym diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am index 38e515f8252..5d394866946 100644 --- a/src/gallium/targets/osmesa/Makefile.am +++ b/src/gallium/targets/osmesa/Makefile.am @@ -74,6 +74,12 @@ lib@OSMESA_LIB@_la_LDFLAGS += $(LLVM_LDFLAGS) lib@OSMESA_LIB@_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS) endif +if HAVE_GALLIUM_SWR +AM_CPPFLAGS += -DGALLIUM_SWR +lib@OSMESA_LIB@_la_LDFLAGS += $(LLVM_LDFLAGS) +lib@OSMESA_LIB@_la_LIBADD += $(top_builddir)/src/gallium/drivers/swr/libmesaswr.la $(LLVM_LIBS) +endif + EXTRA_lib@OSMESA_LIB@_la_DEPENDENCIES = osmesa.sym EXTRA_DIST = \ osmesa.sym \ -- cgit v1.2.3