diff options
| author | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2011-02-04 12:22:58 +0100 |
|---|---|---|
| committer | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2011-02-07 13:52:29 +0100 |
| commit | e586c4b7634f856a350f029709adc8a32271562c (patch) | |
| tree | 98c9e0b4c81b7c14048c732a7bf5e98a9b459a7b /src/egl | |
| parent | 2adfde3aaee43d7ec974d25794a07fe02f36c6cd (diff) | |
egl: Add wayland platform
Diffstat (limited to 'src/egl')
| -rw-r--r-- | src/egl/Makefile | 4 | ||||
| -rw-r--r-- | src/egl/main/Makefile | 5 | ||||
| -rw-r--r-- | src/egl/main/egldisplay.c | 1 | ||||
| -rw-r--r-- | src/egl/main/egldisplay.h | 1 |
4 files changed, 10 insertions, 1 deletions
diff --git a/src/egl/Makefile b/src/egl/Makefile index 50f227f07d..52daf2efa7 100644 --- a/src/egl/Makefile +++ b/src/egl/Makefile @@ -5,6 +5,10 @@ include $(TOP)/configs/current SUBDIRS = drivers main +ifneq ($(findstring wayland, $(EGL_PLATFORMS)),) +SUBDIRS += wayland +endif + default: subdirs diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile index c710631688..a5b9299502 100644 --- a/src/egl/main/Makefile +++ b/src/egl/main/Makefile @@ -58,7 +58,7 @@ LOCAL_LIBS = ifeq ($(filter dri2, $(EGL_DRIVERS_DIRS)),dri2) LOCAL_CFLAGS += -D_EGL_BUILT_IN_DRIVER_DRI2 LOCAL_LIBS += $(TOP)/src/egl/drivers/dri2/libegl_dri2.a -EGL_LIB_DEPS += $(XCB_DRI2_LIBS) $(LIBUDEV_LIBS) $(DLOPEN_LIBS) $(LIBDRM_LIB) +EGL_LIB_DEPS += $(XCB_DRI2_LIBS) $(LIBUDEV_LIBS) $(DLOPEN_LIBS) $(LIBDRM_LIB) $(WAYLAND_LIBS) endif ifeq ($(filter glx, $(EGL_DRIVERS_DIRS)),glx) LOCAL_CFLAGS += -D_EGL_BUILT_IN_DRIVER_GLX @@ -71,6 +71,9 @@ EGL_NATIVE_PLATFORM=_EGL_INVALID_PLATFORM ifeq ($(firstword $(EGL_PLATFORMS)),x11) EGL_NATIVE_PLATFORM=_EGL_PLATFORM_X11 endif +ifeq ($(firstword $(EGL_PLATFORMS)),wayland) +EGL_NATIVE_PLATFORM=_EGL_PLATFORM_WAYLAND +endif ifeq ($(firstword $(EGL_PLATFORMS)),drm) EGL_NATIVE_PLATFORM=_EGL_PLATFORM_DRM endif diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c index 565e44d2d2..3059294729 100644 --- a/src/egl/main/egldisplay.c +++ b/src/egl/main/egldisplay.c @@ -27,6 +27,7 @@ _eglGetNativePlatformFromEnv(void) } egl_platforms[_EGL_NUM_PLATFORMS] = { { _EGL_PLATFORM_WINDOWS, "gdi" }, { _EGL_PLATFORM_X11, "x11" }, + { _EGL_PLATFORM_WAYLAND, "wayland" }, { _EGL_PLATFORM_DRM, "drm" }, { _EGL_PLATFORM_FBDEV, "fbdev" } }; diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h index dbc5d32d91..ce035eb2ef 100644 --- a/src/egl/main/egldisplay.h +++ b/src/egl/main/egldisplay.h @@ -11,6 +11,7 @@ enum _egl_platform_type { _EGL_PLATFORM_WINDOWS, _EGL_PLATFORM_X11, + _EGL_PLATFORM_WAYLAND, _EGL_PLATFORM_DRM, _EGL_PLATFORM_FBDEV, |