[Mesa-dev] [PATCH] egl/gallium: fix build without softpipe and llvmpipe

[Benjamin Franzke]

Looks good to me too, and since there were no complaints, pushed.
Thanks.

2011/7/25 Tobias Droste <tdroste at gmx.de>:
> Signed-off-by: Tobias Droste <tdroste at gmx.de>
> Acked-by: Jakob Bornecrantz <wallbraker at gmail.com>
> Reviewed-by: Marek Olšák <maraeo at gmail.com>
> ---
>  src/gallium/targets/egl-static/Makefile |   12 +++++++++---
>  1 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/src/gallium/targets/egl-static/Makefile b/src/gallium/targets/egl-static/Makefile
> index 69e7eec..5b7b330 100644
> --- a/src/gallium/targets/egl-static/Makefile
> +++ b/src/gallium/targets/egl-static/Makefile
> @@ -141,10 +141,18 @@ egl_LIBS += \
>        $(TOP)/src/gallium/drivers/svga/libsvga.a
>  endif
>
> -# swrast
> +# softpipe
> +ifneq ($(findstring softpipe,$(GALLIUM_DRIVERS_DIRS)),)
>  egl_CPPFLAGS += -DGALLIUM_SOFTPIPE -DGALLIUM_RBUG -DGALLIUM_TRACE
>  egl_LIBS += $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a
>  egl_SYS += -lm
> +endif
> +
> +# llvmpipe
> +ifneq ($(findstring llvmpipe,$(GALLIUM_DRIVERS_DIRS)),)
> +egl_CPPFLAGS += -DGALLIUM_LLVMPIPE
> +egl_LIBS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
> +endif
>
>  # sort to remove duplicates
>  egl_CPPFLAGS := $(sort $(egl_CPPFLAGS))
> @@ -158,8 +166,6 @@ st_GL_SYS := -lm -lpthread $(DLOPEN_LIBS)
>
>  # LLVM
>  ifeq ($(MESA_LLVM),1)
> -egl_CPPFLAGS += -DGALLIUM_LLVMPIPE
> -egl_LIBS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
>  egl_SYS += $(LLVM_LIBS)
>  LDFLAGS += $(LLVM_LDFLAGS)
>
> --
> 1.7.3.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>