From 8aba54422d9a77383c150f9f70240b18b6e1918e Mon Sep 17 00:00:00 2001 From: Prabhu Sundararaj Date: Thu, 9 Apr 2015 15:47:21 -0500 Subject: [PATCH] Add OpenVG demos to support wayland. Upstream Status: Pending Signed-off-by: Prabhu Sundararaj --- src/egl/Makefile.am | 6 +++--- src/egl/openvg/Makefile.am | 33 +++++++++++++++++++++++++++++---- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am index 4fe1ca8..65f4570 100644 --- a/src/egl/Makefile.am +++ b/src/egl/Makefile.am @@ -26,10 +26,10 @@ SUBDIRS = \ eglut \ opengles1 \ opengles2 \ - oes_vg + oes_vg \ + openvg if HAVE_GLU SUBDIRS += \ - opengl \ - openvg + opengl endif diff --git a/src/egl/openvg/Makefile.am b/src/egl/openvg/Makefile.am index b545225..a2e0d94 100644 --- a/src/egl/openvg/Makefile.am +++ b/src/egl/openvg/Makefile.am @@ -46,31 +46,56 @@ EGL_X11_DEMOS += \ text endif endif +if HAVE_WAYLAND +EGL_WL_DEMOS = \ + lion_wayland \ + sp_wayland +if HAVE_FREETYPE2 +EGL_WL_DEMOS += \ + vgtext_wayland +endif +endif if HAVE_EGL if HAVE_VG bin_PROGRAMS = \ lion_screen \ sp_screen \ - $(EGL_X11_DEMOS) + $(EGL_X11_DEMOS) \ + $(EGL_WL_DEMOS) endif endif lion_screen_SOURCES = lion.c lion-render.c lion-render.h +lion_screen_LDADD = ../eglut/libeglut_screen.la + sp_screen_SOURCES = sp.c +sp_screen_LDADD = ../eglut/libeglut_screen.la +if HAVE_X11 lion_x11_SOURCES = lion.c lion-render.c lion-render.h sp_x11_SOURCES = sp.c -lion_screen_LDADD = ../eglut/libeglut_screen.la -sp_screen_LDADD = ../eglut/libeglut_screen.la - lion_x11_LDADD = ../eglut/libeglut_x11.la sp_x11_LDADD = ../eglut/libeglut_x11.la text_SOURCES = text.c text_CFLAGS = $(AM_CFLAGS) @FREETYPE2_CFLAGS@ text_LDADD = @FREETYPE2_LIBS@ ../eglut/libeglut_x11.la +endif + +if HAVE_WAYLAND +lion_wayland_SOURCES = lion.c lion-render.c lion-render.h +lion_wayland_LDADD = ../eglut/libeglut_wayland.la + +sp_wayland_SOURCES = sp.c +sp_wayland_LDADD = ../eglut/libeglut_wayland.la + +vgtext_wayland_SOURCES = text.c +vgtext_wayland_CFLAGS = $(AM_CFLAGS) @FREETYPE2_CFLAGS@ +vgtext_wayland_LDADD = @FREETYPE2_LIBS@ ../eglut/libeglut_wayland.la + +endif SUBDIRS = \ trivial -- 2.3.5