diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2017-12-17 20:54:06 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2017-12-19 12:02:31 +0000 |
| commit | 06e4403fdb86d481e0600e2250f3ae625ba60cb4 (patch) | |
| tree | e9465c0d3cf3191e50d0bab3e62d389cfa885dc0 /tests | |
| parent | ee589cd337ffaf2c4096cdaaae44c502d7ef0cd0 (diff) | |
| download | gstreamer-plugins-bad-06e4403fdb86d481e0600e2250f3ae625ba60cb4.tar.gz | |
gl: update plugins to use GstGL from -base
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/check/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/examples/gtk/Makefile.am | 23 |
2 files changed, 13 insertions, 14 deletions
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 3fae4e574..4969c4ad0 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -296,8 +296,8 @@ AM_CFLAGS = $(GST_CFLAGS) $(GST_CHECK_CFLAGS) $(GST_OPTION_CFLAGS) \ -UG_DISABLE_ASSERT -UG_DISABLE_CAST_CHECKS $(PTHREAD_CFLAGS) LDADD = $(GST_CHECK_LIBS) -generic_states_CFLAGS = $(AM_CFLAGS) $(GMODULE_NO_EXPORT_CFLAGS) -generic_states_LDADD = $(LDADD) $(GMODULE_NO_EXPORT_LIBS) +generic_states_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) +generic_states_LDADD = $(LDADD) $(GLIB_LIBS) elements_audiomixer_LDADD = $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) -lgstbase-@GST_API_VERSION@ $(LDADD) elements_audiomixer_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(AM_CFLAGS) diff --git a/tests/examples/gtk/Makefile.am b/tests/examples/gtk/Makefile.am index adf5e3178..15636d9f2 100644 --- a/tests/examples/gtk/Makefile.am +++ b/tests/examples/gtk/Makefile.am @@ -12,30 +12,29 @@ if USE_GL noinst_PROGRAMS += gtkglsink glliveshader gtkglsink_SOURCES = gtkglsink.c -gtkglsink_CFLAGS = $(GTK3_CFLAGS) \ +gtkglsink_CFLAGS = \ $(GST_PLUGINS_BAD_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_CFLAGS) \ $(GL_CFLAGS) \ - -DGST_USE_UNSTABLE_API -gtkglsink_LDADD = $(GTK3_LIBS) \ + $(GTK3_CFLAGS) +gtkglsink_LDADD = \ + $(GST_GL_LIBS) \ $(GST_LIBS) \ - $(GL_LIBS) \ + $(GTK3_LIBS) \ $(X11_LIBS) glliveshader_SOURCES = glliveshader.c -glliveshader_CFLAGS = $(GTK3_CFLAGS) \ - -I$(top_srcdir)/gst-libs \ - -I$(top_builddir)/gst-libs \ +glliveshader_CFLAGS = \ $(GST_PLUGINS_BAD_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_GL_CFLAGS) \ $(GST_CFLAGS) \ - $(GL_CFLAGS) \ - -DGST_USE_UNSTABLE_API -glliveshader_LDADD = $(GTK3_LIBS) \ + $(GTK3_CFLAGS) +glliveshader_LDADD = \ + $(GST_GL_LIBS) \ $(GST_LIBS) \ - $(GL_LIBS) \ - $(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_API_VERSION).la \ + $(GTK3_LIBS) \ $(X11_LIBS) endif endif |