diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2016-01-04 10:11:20 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2016-01-04 10:21:21 +0200 |
| commit | ecb3636579632212f180b478a00bfd9d8f0ce0a9 (patch) | |
| tree | d0dbec9a5e187045594c2bd6a43f1353fbdfea9b /gtk | |
| parent | 14b945de5a98fe3d3ab306651ad3ecb494a1743d (diff) | |
player: Build against GstPlayer version from gst-plugins-bad everywhere
The old version with everything included and buildable against GStreamer 1.6
can still be found in the gst-player-0.1 branch and will be continued to be
updated for a while.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/Makefile.am | 5 | ||||
| -rw-r--r-- | gtk/gtk-play.c | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 97ce95d..45623e5 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -28,9 +28,8 @@ BUILT_SOURCES: gtk-play-resources.c gtk-play-resources.h gtk_play_SOURCES = gtk-play.c gtk-play-resources.c gtk-video-renderer.c -LDADD = $(top_builddir)/lib/gst/player/.libs/libgstplayer-@GST_PLAYER_API_VERSION@.la \ - $(GSTREAMER_LIBS) $(GTK_LIBS) $(GTK_X11_LIBS) $(GLIB_LIBS) $(LIBM) $(GMODULE_LIBS) +LDADD = $(GSTREAMER_LIBS) $(GTK_LIBS) $(GTK_X11_LIBS) $(GLIB_LIBS) $(LIBM) $(GMODULE_LIBS) -AM_CFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib $(GSTREAMER_CFLAGS) $(GTK_CFLAGS) $(GTK_X11_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(WARNING_CFLAGS) +AM_CFLAGS = $(GSTREAMER_CFLAGS) $(GTK_CFLAGS) $(GTK_X11_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(WARNING_CFLAGS) noinst_HEADERS = gtk-play-resources.h gtk-video-renderer.h diff --git a/gtk/gtk-play.c b/gtk/gtk-play.c index 51d0bf0..c91693b 100644 --- a/gtk/gtk-play.c +++ b/gtk/gtk-play.c @@ -24,7 +24,6 @@ #include <gst/gst.h> #include <gst/tag/tag.h> -#include <gst/video/videooverlay.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk/gdk.h> |