[Mesa-dev] [PATCH] st/egl: Fix build for wayland includes

[Kristian Høgsberg]

On Tue, Jul 17, 2012 at 08:01:43PM +0900, Elvis Lee wrote:
> common/native_wayland_drm_bufmgr_helper.c fails to find wayland-server.h

Applied, thanks.

Kristian

> Signed-off-by: Elvis Lee <kwangwoong.lee at lge.com>
> ---
>  src/gallium/state_trackers/egl/Makefile |    7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/src/gallium/state_trackers/egl/Makefile b/src/gallium/state_trackers/egl/Makefile
> index fe42fbb..66b2e7e 100644
> --- a/src/gallium/state_trackers/egl/Makefile
> +++ b/src/gallium/state_trackers/egl/Makefile
> @@ -28,7 +28,7 @@ wayland_INCLUDES = \
>  	-I$(TOP)/src/gallium/winsys \
>  	-I$(TOP)/src/egl/wayland/wayland-egl \
>  	-I$(TOP)/src/egl/wayland/wayland-drm \
> -	$(shell $(PKG_CONFIG) --cflags-only-I libdrm wayland-client)
> +	$(shell $(PKG_CONFIG) --cflags-only-I libdrm wayland-client wayland-server)
>  
>  wayland_SOURCES = $(wildcard wayland/*.c)
>  wayland_OBJECTS = $(wayland_SOURCES:.c=.o)
> @@ -49,8 +49,8 @@ null_SOURCES = $(wildcard null/*.c)
>  null_OBJECTS = $(null_SOURCES:.c=.o)
>  
>  
> -ALL_INCLUDES = $(common_INCLUDES) $(x11_INCLUDES) $(drm_INCLUDES) $(fbdev_INCLUDES) $(null_INCLUDES)
> -ALL_SOURCES = $(common_SOURCES) $(x11_SOURCES) $(drm_SOURCES) $(fbdev_SOURCES) $(null_SOURCES)
> +ALL_INCLUDES = $(common_INCLUDES) $(x11_INCLUDES) $(drm_INCLUDES) $(fbdev_INCLUDES) $(null_INCLUDES) $(wayland_INCLUDES)
> +ALL_SOURCES = $(common_SOURCES) $(x11_SOURCES) $(drm_SOURCES) $(fbdev_SOURCES) $(null_SOURCES) $(wayland_SOURCES)
>  
>  EGL_OBJECTS = $(common_OBJECTS)
>  EGL_CPPFLAGS = $(common_INCLUDES)
> @@ -64,6 +64,7 @@ ifneq ($(findstring wayland, $(EGL_PLATFORMS)),)
>  EGL_OBJECTS += $(wayland_OBJECTS)
>  EGL_CPPFLAGS += -DHAVE_WAYLAND_BACKEND
>  DEFINES += -DHAVE_WAYLAND_BACKEND
> +common_INCLUDES += $(wayland_INCLUDES)
>  endif
>  ifneq ($(findstring drm, $(EGL_PLATFORMS)),)
>  EGL_OBJECTS += $(drm_OBJECTS)
> -- 
> 1.7.9.5
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev