diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2015-12-08 14:24:36 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2015-12-08 14:24:36 +0000 |
| commit | dd305950848891b5b91673033af134d3e1728cc3 (patch) | |
| tree | 4beb9d6da4233e4646a7a4cb37128c9d091c496b | |
| parent | 968022b83fa60c542ba35ede2490e750bd883cb2 (diff) | |
| download | clutter-dd305950848891b5b91673033af134d3e1728cc3.tar.gz | |
gdk: Check for both GDK and Cogl winsys support
When using GDK and Cogl API, we need to check that both GDK and Cogl
have been built with support for that API, otherwise the build will
likely fail.
| -rw-r--r-- | clutter/gdk/clutter-stage-gdk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clutter/gdk/clutter-stage-gdk.c b/clutter/gdk/clutter-stage-gdk.c index a80cd3945..10b555043 100644 --- a/clutter/gdk/clutter-stage-gdk.c +++ b/clutter/gdk/clutter-stage-gdk.c @@ -161,7 +161,7 @@ clutter_stage_gdk_resize (ClutterStageWindow *stage_window, */ if (!stage_gdk->foreign_window) gdk_window_resize (stage_gdk->window, width, height); -#if defined(GDK_WINDOWING_WAYLAND) +#if defined(GDK_WINDOWING_WAYLAND) && defined(COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT) else if (GDK_IS_WAYLAND_WINDOW (stage_gdk->window)) { int scale = gdk_window_get_scale_factor (stage_gdk->window); @@ -279,7 +279,7 @@ _clutter_stage_gdk_notify_configure (ClutterStageGdk *stage_gdk, ClutterStageCogl *stage_cogl = CLUTTER_STAGE_COGL (stage_gdk); int scale = gdk_window_get_scale_factor (stage_gdk->window); -#if defined(GDK_WINDOWING_WAYLAND) +#if defined(GDK_WINDOWING_WAYLAND) && defined(COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT) if (GDK_IS_WAYLAND_WINDOW (stage_gdk->window) && gdk_window_get_window_type (stage_gdk->window) == GDK_WINDOW_CHILD && stage_gdk->subsurface) @@ -294,7 +294,7 @@ _clutter_stage_gdk_notify_configure (ClutterStageGdk *stage_gdk, } else #endif -#if defined(GDK_WINDOWING_X11) +#if defined(GDK_WINDOWING_X11) && defined(COGL_HAS_XLIB_SUPPORT) if (GDK_IS_X11_WINDOW (stage_gdk->window)) { ClutterBackend *backend = CLUTTER_BACKEND (stage_cogl->backend); |