diff options
| author | Matthew Waters <ystreet00@gmail.com> | 2014-03-16 15:08:23 +0100 |
|---|---|---|
| committer | Matthew Waters <ystreet00@gmail.com> | 2014-03-16 15:17:59 +0100 |
| commit | 6b3fe4418538bcdb8ccccd274ba22764ae203e6f (patch) | |
| tree | ad136e37420da6b0b3262745396441eb38d720bb /tests/check | |
| parent | 870503dc6bb5f8ea59a2605ded81e5c28ffde58c (diff) | |
| download | gstreamer-plugins-bad-6b3fe4418538bcdb8ccccd274ba22764ae203e6f.tar.gz | |
Move gst-plugins-gl to bad
Diffstat (limited to 'tests/check')
| -rw-r--r-- | tests/check/Makefile.am | 36 | ||||
| -rw-r--r-- | tests/check/libs/.gitignore | 3 |
2 files changed, 39 insertions, 0 deletions
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index dc72fed5c..0a1ae0166 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -176,6 +176,14 @@ else check_shm= endif +if USE_GL +check_gl=libs/gstglcontext \ + libs/gstglmemory \ + libs/gstglupload +else +check_gl= +endif + VALGRIND_TO_FIX = \ elements/mpeg2enc \ elements/mplex \ @@ -242,6 +250,7 @@ check_PROGRAMS = \ $(check_zbar) \ $(check_orc) \ libs/insertbin \ + $(check_gl) \ $(EXPERIMENTAL_CHECKS) noinst_HEADERS = elements/mxfdemux.h @@ -409,6 +418,33 @@ orc/audiomixer.c: $(top_srcdir)/gst/audiomixer/gstaudiomixerorc.orc $(MKDIR_P) orc $(ORCC) --test -o $@ $< +libs_gstglcontext_LDADD = \ + $(GST_PLUGINS_BAD_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) \ + $(top_builddir)/gst-libs/gst/gl/libgstgl-@GST_API_VERSION@.la + +libs_gstglcontext_CFLAGS = \ + $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \ + -DGST_USE_UNSTABLE_API \ + $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS) + +libs_gstglmemory_LDADD = \ + $(GST_PLUGINS_BAD_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) \ + $(top_builddir)/gst-libs/gst/gl/libgstgl-@GST_API_VERSION@.la + +libs_gstglmemory_CFLAGS = \ + $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \ + -DGST_USE_UNSTABLE_API \ + $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS) + +libs_gstglupload_CFLAGS = \ + $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \ + -DGST_USE_UNSTABLE_API \ + $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS) + +libs_gstglupload_LDADD = \ + $(GST_PLUGINS_BAD_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) \ + $(top_builddir)/gst-libs/gst/gl/libgstgl-@GST_API_VERSION@.la + distclean-local-orc: rm -rf orc diff --git a/tests/check/libs/.gitignore b/tests/check/libs/.gitignore index 6e72e669f..13581fbbf 100644 --- a/tests/check/libs/.gitignore +++ b/tests/check/libs/.gitignore @@ -4,3 +4,6 @@ mpegvideoparser mpegts vc1parser insertbin +gstglcontext +gstglmemory +gstglupload |