enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

Comp: Fix building without wayland clients. 

SVN revision: 67424
This commit is contained in:
Christopher Michael 2012-01-21 09:22:01 +00:00
parent f218a4c893
commit 2cef205925
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/comp/Makefile.am
View File

@ -30,10 +30,12 @@ module_la_SOURCES = e_mod_main.c \
e_mod_comp_update.c \
e_mod_comp_update.h \
e_mod_comp_cfdata.c \
e_mod_comp_cfdata.h \
e_mod_comp_wayland.h \
e_mod_comp_wayland.c
e_mod_comp_cfdata.h
if HAVE_WAYLAND
module_la_SOURCES += e_mod_comp_wayland.h \
e_mod_comp_wayland.c
endif
module_la_LIBADD = @e_libs@ @dlopen_libs@ @WAYLAND_LIBS@
module_la_LDFLAGS = -module -avoid-version
module_la_DEPENDENCIES = $(top_builddir)/config.h

11
src/modules/comp/e_mod_comp_wayland.c
View File

@ -15,6 +15,7 @@ typedef struct _Wayland_Shell Wayland_Shell;
typedef struct _Wayland_Surface Wayland_Surface;
typedef struct _Wayland_Shell_Surface Wayland_Shell_Surface;
typedef struct _Wayland_Frame_Callback Wayland_Frame_Callback;
typedef struct _Wayland_Shader Wayland_Shader;
enum _Wayland_Shell_Surface_Type
{
@ -120,6 +121,16 @@ struct _Wayland_Frame_Callback
struct wl_list link;
};
struct _Wayland_Shader
{
GLuint program;
GLuint vertex, fragment;
struct
{
GLuint proj, tex, alpha, color;
} uniform;
};
struct wl_shell
{
Wayland_Shell shell;