Merge branch 'gallium-polygon-stipple'

[mesa.git] / src / gallium / state_trackers / egl / Makefile

diff --git a/src/gallium/state_trackers/egl/Makefile b/src/gallium/state_trackers/egl/Makefile
index 686432140608bf1e684c375d7e361d2d506a591b..1c970222c1f97a54059c8491995e819f518553ba 100644 (file)
--- a/src/gallium/state_trackers/egl/Makefile
+++ b/src/gallium/state_trackers/egl/Makefile
@@ -6,6 +6,7 @@ common_INCLUDES = \
        -I$(TOP)/src/gallium/include \
        -I$(TOP)/src/gallium/auxiliary \
        -I$(TOP)/src/egl/main \
+       -I$(TOP)/src/egl/wayland/wayland-drm/ \
        -I$(TOP)/include
 
 common_SOURCES = $(wildcard common/*.c)
@@ -25,14 +26,15 @@ x11_OBJECTS = $(x11_SOURCES:.c=.o)
 
 wayland_INCLUDES = \
        -I$(TOP)/src/gallium/winsys \
-       -I$(TOP)/src/egl/wayland \
+       -I$(TOP)/src/egl/wayland/wayland-egl \
        -I$(TOP)/src/egl/wayland/wayland-drm \
        $(shell pkg-config --cflags-only-I libdrm wayland-client)
 
 wayland_SOURCES = $(wildcard wayland/*.c)
 wayland_OBJECTS = $(wayland_SOURCES:.c=.o)
 
-drm_INCLUDES = -I$(TOP)/src/gallium/winsys $(shell pkg-config --cflags-only-I libdrm)
+drm_INCLUDES = -I$(TOP)/src/gallium/winsys $(shell pkg-config --cflags-only-I libdrm) \
+              -I$(TOP)/src/gbm/main -I$(TOP)/src/gallium/state_trackers/gbm
 drm_SOURCES = $(wildcard drm/*.c)
 drm_OBJECTS = $(drm_SOURCES:.c=.o)
 
@@ -56,6 +58,7 @@ endif
 ifneq ($(findstring wayland, $(EGL_PLATFORMS)),)
 EGL_OBJECTS += $(wayland_OBJECTS)
 EGL_CPPFLAGS += -DHAVE_WAYLAND_BACKEND
+DEFINES += -DHAVE_WAYLAND_BACKEND
 endif
 ifneq ($(findstring drm, $(EGL_PLATFORMS)),)
 EGL_OBJECTS += $(drm_OBJECTS)