[Mesa-dev] [PATCH v2 8/8] swr: Fix linux build

[Emil Velikov]

On 9 November 2016 at 23:18, George Kyriazis <george.kyriazis at intel.com> wrote:
> Added compiler flags for libmesaswr, since it now includes core header
> files.
> ---
>  src/gallium/drivers/swr/Makefile.am | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/src/gallium/drivers/swr/Makefile.am b/src/gallium/drivers/swr/Makefile.am
> index dd1c2e6..843d3b5
> --- a/src/gallium/drivers/swr/Makefile.am
> +++ b/src/gallium/drivers/swr/Makefile.am
> @@ -217,6 +217,12 @@ libswrAVX2_la_CXXFLAGS = \
>  libswrAVX2_la_SOURCES = \
>         $(COMMON_SOURCES)
>
> +# XXX: $(SWR_AVX_CXXFLAGS) should not be included, but we end up including
> +# simdintrin.h, which throws a warning if AVX is not enabled
> +libmesaswr_la_CXXFLAGS = \
> +       $(COMMON_CXXFLAGS) \
> +       $(SWR_AVX_CXXFLAGS)
> +
You can avoid either of these by:
 - Dropping the _WIN32 guard around swr_gdi_swap.
 - including the pipe_{screen,resource,foo}.h instead of the swr ones.

>  # XXX: Don't ship these generated sources for now, since they are specific
>  # to the LLVM version they are generated from. Thus a release tarball
>  # containing the said files, generated against eg. LLVM 3.8 will fail to build
> @@ -235,6 +241,7 @@ libswrAVX2_la_LDFLAGS = \
>  include $(top_srcdir)/install-gallium-links.mk
>
>  EXTRA_DIST = \
> +       SConscript \
Please keep this alongside the file introduction. With this...
... the patch magically disappears ;-)

Emil