Commit 8f9e92e8 authored by Michael Teyfel's avatar Michael Teyfel Committed by Daniel Stone
Browse files

ivi-shell: linked libweston-desktop and added structs


Signed-off-by: Michael Teyfel's avatarMichael Teyfel <mteyfel@de.adit-jv.com>
parent 4d886d60
...@@ -1093,6 +1093,7 @@ ivi_shell_la_LDFLAGS = -module -avoid-version ...@@ -1093,6 +1093,7 @@ ivi_shell_la_LDFLAGS = -module -avoid-version
ivi_shell_la_LIBADD = \ ivi_shell_la_LIBADD = \
libshared.la \ libshared.la \
libweston-@LIBWESTON_MAJOR@.la \ libweston-@LIBWESTON_MAJOR@.la \
libweston-desktop-@LIBWESTON_MAJOR@.la \
$(COMPOSITOR_LIBS) $(COMPOSITOR_LIBS)
ivi_shell_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) ivi_shell_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS)
ivi_shell_la_SOURCES = \ ivi_shell_la_SOURCES = \
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include "compositor.h" #include "compositor.h"
#include "ivi-layout-export.h" #include "ivi-layout-export.h"
#include "libweston-desktop/libweston-desktop.h"
struct ivi_layout_view { struct ivi_layout_view {
struct wl_list link; /* ivi_layout::view_list */ struct wl_list link; /* ivi_layout::view_list */
...@@ -52,6 +53,7 @@ struct ivi_layout_surface { ...@@ -52,6 +53,7 @@ struct ivi_layout_surface {
struct ivi_layout *layout; struct ivi_layout *layout;
struct weston_surface *surface; struct weston_surface *surface;
struct weston_desktop_surface *weston_desktop_surface;
struct ivi_layout_surface_properties prop; struct ivi_layout_surface_properties prop;
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#include "ivi-shell.h" #include "ivi-shell.h"
#include "ivi-application-server-protocol.h" #include "ivi-application-server-protocol.h"
#include "ivi-layout-export.h" #include "ivi-layout-private.h"
#include "ivi-layout-shell.h" #include "ivi-layout-shell.h"
#include "shared/helpers.h" #include "shared/helpers.h"
#include "compositor/weston.h" #include "compositor/weston.h"
...@@ -265,6 +265,8 @@ application_surface_create(struct wl_client *client, ...@@ -265,6 +265,8 @@ application_surface_create(struct wl_client *client,
return; return;
} }
layout_surface->weston_desktop_surface = NULL;
ivisurf = zalloc(sizeof *ivisurf); ivisurf = zalloc(sizeof *ivisurf);
if (ivisurf == NULL) { if (ivisurf == NULL) {
wl_resource_post_no_memory(resource); wl_resource_post_no_memory(resource);
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <stdint.h> #include <stdint.h>
#include "compositor.h" #include "compositor.h"
#include "libweston-desktop/libweston-desktop.h"
struct ivi_shell struct ivi_shell
{ {
...@@ -38,6 +39,7 @@ struct ivi_shell ...@@ -38,6 +39,7 @@ struct ivi_shell
struct weston_compositor *compositor; struct weston_compositor *compositor;
struct weston_desktop *desktop;
struct wl_list ivi_surface_list; /* struct ivi_shell_surface::link */ struct wl_list ivi_surface_list; /* struct ivi_shell_surface::link */
}; };
......
...@@ -12,7 +12,7 @@ if get_option('shell-ivi') ...@@ -12,7 +12,7 @@ if get_option('shell-ivi')
'ivi-shell', 'ivi-shell',
srcs_shell_ivi, srcs_shell_ivi,
include_directories: include_directories('..', '../shared'), include_directories: include_directories('..', '../shared'),
dependencies: dep_libweston, dependencies: [ dep_lib_desktop, dep_libweston ],
name_prefix: '', name_prefix: '',
install: true, install: true,
install_dir: dir_module_weston install_dir: dir_module_weston
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment