[PATCH] clients/nested: Fix compilation

[sardemff7+wayland at sardemff7.net]

On 04/06/2013 13:05, Armin K wrote:
> ---
>   clients/Makefile.am | 2 +-
>   clients/nested.c    | 3 +++
>   configure.ac        | 1 +
>   3 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/clients/Makefile.am b/clients/Makefile.am
> index 1379c4b..d84f575 100644
> --- a/clients/Makefile.am
> +++ b/clients/Makefile.am
> @@ -124,7 +124,7 @@ resizor_SOURCES = resizor.c
>   resizor_LDADD = libtoytoolkit.la
>
>   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

Fine.


> diff --git a/clients/nested.c b/clients/nested.c
> index baaff64..132724d 100644
> --- a/clients/nested.c
> +++ b/clients/nested.c
> @@ -34,8 +34,11 @@
>
>   #include <EGL/egl.h>
>   #include <EGL/eglext.h>
> +
> +#ifdef USE_CAIRO_GLESV2
>   #include <GLES2/gl2.h>
>   #include <GLES2/gl2ext.h>
> +#endif /* USE_CAIRO_GLESV2 */
>
>   #include <cairo-gl.h>
>

Are you sure the nested client work with desktop GL then?


> diff --git a/configure.ac b/configure.ac
> index ba1fcac..98798c9 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -227,6 +227,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 ],
>

Fine.


-- 

Quentin “Sardem FF7” Glidic