diff options
| author | Elvis Lee <[email protected]> | 2012-07-17 20:01:43 +0900 |
|---|---|---|
| committer | Kristian Høgsberg <[email protected]> | 2012-07-17 10:54:00 -0400 |
| commit | 1f2c87cc8f50d0a0ec3c9be1ddf6cf035002e5c7 (patch) | |
| tree | 06629fd6b1b5274241a940a48d0ba0cdedb90671 /src/gallium | |
| parent | 23f1e551cc6553ce7f99b9264efc8776f5f35b00 (diff) | |
st/egl: Fix build for wayland includes
common/native_wayland_drm_bufmgr_helper.c fails to find wayland-server.h
Signed-off-by: Elvis Lee <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/state_trackers/egl/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gallium/state_trackers/egl/Makefile b/src/gallium/state_trackers/egl/Makefile index fe42fbb049f..66b2e7ec78f 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) |