From d7c589122b45d4f7735d561a028739d4e92f4805 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Fri, 18 May 2018 10:55:21 +0200 Subject: testegl: properly detect and use rpi specific libs Use pkg-config to detect and configure rpi specific libs used in testegl rather than hardcoding their flags. --- examples/egl/Makefile.am | 8 +++----- examples/egl/meson.build | 5 +++++ 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'examples') diff --git a/examples/egl/Makefile.am b/examples/egl/Makefile.am index 3c3fe3a..ed8d4ed 100644 --- a/examples/egl/Makefile.am +++ b/examples/egl/Makefile.am @@ -18,6 +18,7 @@ testegl_LDADD = \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ $(GST_GL_LIBS) \ + $(BRCMEGL_LIBS) \ -lm if HAVE_GLES2 @@ -32,12 +33,9 @@ if HAVE_X11 testegl_LDADD += $(X11_LIBS) endif -if USE_OMX_TARGET_RPI -testegl_LDADD += -lbcm_host -endif - testegl_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) \ - $(GST_GL_CFLAGS) + $(GST_GL_CFLAGS) \ + $(BRCMEGL_CFLAGS) diff --git a/examples/egl/meson.build b/examples/egl/meson.build index fabbc65..5ba6fc4 100644 --- a/examples/egl/meson.build +++ b/examples/egl/meson.build @@ -16,6 +16,11 @@ if x11_dep.found() or omx_target == 'rpi' gles2_dep = cc.find_library ('GLESv2') endif + if omx_target == 'rpi' + brcmegl_dep = dependency('brcmegl', required : true) + optional_deps += brcmegl_dep + endif + executable ('testegl', sources : egl_sources, c_args : gst_omx_args, -- cgit v1.2.1