brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Fix build when wayland is disabled

Browse Source 
https://gitlab.gnome.org/GNOME/mutter/merge_requests/817
This commit is contained in:
Ting-Wei Lan 2019-09-28 16:26:21 +08:00 committed by Jonas Ådahl
parent 0cdf13ac12
commit 006eb6d81e
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/compositor/compositor.c
View File

@ -595,9 +595,14 @@ meta_compositor_add_window (MetaCompositor *compositor,
window_actor_type = META_TYPE_WINDOW_ACTOR_X11; window_actor_type = META_TYPE_WINDOW_ACTOR_X11;
break; break;
#ifdef HAVE_WAYLAND
case META_WINDOW_CLIENT_TYPE_WAYLAND: case META_WINDOW_CLIENT_TYPE_WAYLAND:
window_actor_type = META_TYPE_WINDOW_ACTOR_WAYLAND; window_actor_type = META_TYPE_WINDOW_ACTOR_WAYLAND;
break; break;
#endif
default:
g_return_if_reached ();
} }
window_actor = g_object_new (window_actor_type, window_actor = g_object_new (window_actor_type,

1
src/compositor/meta-window-actor.c
View File

@ -29,6 +29,7 @@
#include "core/frame.h" #include "core/frame.h"
#include "compositor/compositor-private.h" #include "compositor/compositor-private.h"
#include "compositor/meta-cullable.h" #include "compositor/meta-cullable.h"
#include "compositor/meta-shaped-texture-private.h"
#include "compositor/meta-surface-actor-x11.h" #include "compositor/meta-surface-actor-x11.h"
#include "compositor/meta-surface-actor.h" #include "compositor/meta-surface-actor.h"
#include "compositor/meta-window-actor-private.h" #include "compositor/meta-window-actor-private.h"

4
src/meson.build
View File

@ -317,8 +317,6 @@ mutter_sources = [
'compositor/meta-texture-tower.h', 'compositor/meta-texture-tower.h',
'compositor/meta-window-actor.c', 'compositor/meta-window-actor.c',
'compositor/meta-window-actor-private.h', 'compositor/meta-window-actor-private.h',
'compositor/meta-window-actor-wayland.c',
'compositor/meta-window-actor-wayland.h',
'compositor/meta-window-actor-x11.c', 'compositor/meta-window-actor-x11.c',
'compositor/meta-window-actor-x11.h', 'compositor/meta-window-actor-x11.h',
'compositor/meta-window-group.c', 'compositor/meta-window-group.c',
@ -475,6 +473,8 @@ if have_wayland
mutter_sources += [ mutter_sources += [
'compositor/meta-surface-actor-wayland.c', 'compositor/meta-surface-actor-wayland.c',
'compositor/meta-surface-actor-wayland.h', 'compositor/meta-surface-actor-wayland.h',
'compositor/meta-window-actor-wayland.c',
'compositor/meta-window-actor-wayland.h',
'compositor/meta-compositor-server.c', 'compositor/meta-compositor-server.c',
'compositor/meta-compositor-server.h', 'compositor/meta-compositor-server.h',
'wayland/meta-cursor-sprite-wayland.c', 'wayland/meta-cursor-sprite-wayland.c',