mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files
clients/Makefile.am
+7 -4
View File
@@ -60,15 +60,14 @@ clients_programs = \
dnd \ dnd \
smoke \ smoke \
resizor \ resizor \
nested \
nested-client \
eventdemo \ eventdemo \
clickdot \ clickdot \
transformed \ transformed \
fullscreen \ fullscreen \
calibrator \ calibrator \
$(subsurfaces) \ $(subsurfaces) \
$(full_gl_client_programs) $(full_gl_client_programs) \
$(cairo_glesv2_programs)
desktop_shell = weston-desktop-shell desktop_shell = weston-desktop-shell
@@ -123,11 +122,15 @@ smoke_LDADD = libtoytoolkit.la
resizor_SOURCES = resizor.c resizor_SOURCES = resizor.c
resizor_LDADD = libtoytoolkit.la resizor_LDADD = libtoytoolkit.la
if HAVE_CAIRO_GLESV2
cairo_glesv2_programs = nested nested-client
nested_SOURCES = nested.c nested_SOURCES = nested.c
nested_LDADD = libtoytoolkit.la nested_LDADD = libtoytoolkit.la $(SERVER_LIBS)
nested_client_SOURCES = nested-client.c nested_client_SOURCES = nested-client.c
nested_client_LDADD = $(SIMPLE_EGL_CLIENT_LIBS) -lm nested_client_LDADD = $(SIMPLE_EGL_CLIENT_LIBS) -lm
endif
eventdemo_SOURCES = eventdemo.c eventdemo_SOURCES = eventdemo.c
eventdemo_LDADD = libtoytoolkit.la eventdemo_LDADD = libtoytoolkit.la
configure.ac
+4
View File
@@ -236,6 +236,7 @@ if test x$enable_clients = xyes; then
AC_DEFINE([BUILD_CLIENTS], [1], [Build the Wayland clients]) 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(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(WESTON_INFO, [wayland-client])
PKG_CHECK_MODULES(POPPLER, [poppler-glib glib-2.0 gobject-2.0 gio-2.0 ], 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_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, AM_CONDITIONAL(BUILD_FULL_GL_CLIENTS,
test x$cairo_modules = "xcairo-gl" -a "x$have_cairo_egl" = "xyes" -a "x$enable_egl" = "xyes") test x$cairo_modules = "xcairo-gl" -a "x$have_cairo_egl" = "xyes" -a "x$enable_egl" = "xyes")