fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2025-12-24 19:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

clients/nested: Fix compilation

Browse source
This commit is contained in:
Armin K 2013-06-04 13:05:22 +02:00 • committed by Kristian Høgsberg
parent a2326ed77f
commit a94e285be7
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
clients/Makefile.am
View file

@ -60,15 +60,14 @@ clients_programs = \
dnd \
smoke \
resizor \
nested \
nested-client \
eventdemo \
clickdot \
transformed \
fullscreen \
calibrator \
$(subsurfaces) \
$(full_gl_client_programs)
$(full_gl_client_programs) \
$(cairo_glesv2_programs)
desktop_shell = weston-desktop-shell
@ -123,11 +122,15 @@ smoke_LDADD = libtoytoolkit.la
resizor_SOURCES = resizor.c
resizor_LDADD = libtoytoolkit.la
if HAVE_CAIRO_GLESV2
cairo_glesv2_programs = nested nested-client
nested_SOURCES = nested.c
nested_LDADD = libtoytoolkit.la
nested_LDADD = libtoytoolkit.la $(SERVER_LIBS)
nested_client_SOURCES = nested-client.c
nested_client_LDADD = $(SIMPLE_EGL_CLIENT_LIBS) -lm
endif
eventdemo_SOURCES = eventdemo.c
eventdemo_LDADD = libtoytoolkit.la

4
configure.ac
View file

@ -236,6 +236,7 @@ if test x$enable_clients = xyes; then
AC_DEFINE([BUILD_CLIENTS], [1], [Build the Wayland clients])
PKG_CHECK_MODULES(CLIENT, [wayland-client cairo >= 1.10.0 xkbcommon wayland-cursor])
PKG_CHECK_MODULES(SERVER, [wayland-server])
PKG_CHECK_MODULES(WESTON_INFO, [wayland-client])
PKG_CHECK_MODULES(POPPLER, [poppler-glib glib-2.0 gobject-2.0 gio-2.0 ],
@ -281,6 +282,9 @@ AM_CONDITIONAL(HAVE_POPPLER, test "x$have_poppler" = "xyes")
AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes")
AM_CONDITIONAL(HAVE_CAIRO_GLESV2,
[test "x$have_cairo_egl" = "xyes" -a "x$cairo_modules" = "xcairo-glesv2" -a "x$enable_egl" = "xyes"])
AM_CONDITIONAL(BUILD_FULL_GL_CLIENTS,
test x$cairo_modules = "xcairo-gl" -a "x$have_cairo_egl" = "xyes" -a "x$enable_egl" = "xyes")