diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2018-08-26 01:23:23 +0200 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2018-09-24 08:39:39 +0100 |
| commit | af5717b3646927013902c690f46162554fd547c3 (patch) | |
| tree | 7fd7c25ae602f5f7720462d7adbe1f65f7e23d67 | |
| parent | 57c8e0146f0e203058c95721527cf50a1dd19f72 (diff) | |
| download | gstreamer-af5717b3646927013902c690f46162554fd547c3.tar.gz | |
tests: netclock-replay: fix build with new api export/import
Can't mix/match imports and exports from the same library
here, so just include all .c files needed instead and don't
link to gstnet at all then.
https://bugzilla.gnome.org/show_bug.cgi?id=797185
| -rw-r--r-- | tests/misc/Makefile.am | 5 | ||||
| -rw-r--r-- | tests/misc/meson.build | 3 | ||||
| -rw-r--r-- | tests/misc/netclock-replay.c | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am index 5aaede5c8c..bccbffd433 100644 --- a/tests/misc/Makefile.am +++ b/tests/misc/Makefile.am @@ -5,8 +5,5 @@ EXTRA_DIST = \ noinst_PROGRAMS = netclock-replay -netclock_replay_LDADD = \ - $(top_builddir)/libs/gst/net/libgstnet-@GST_API_VERSION@.la \ - $(GST_OBJ_LIBS) \ - $(GIO_LIBS) +netclock_replay_LDADD = $(GST_OBJ_LIBS) $(GIO_LIBS) netclock_replay_CFLAGS = $(GST_OBJ_CFLAGS) $(GIO_CFLAGS) diff --git a/tests/misc/meson.build b/tests/misc/meson.build index eedfdc70e2..ca9b5fa084 100644 --- a/tests/misc/meson.build +++ b/tests/misc/meson.build @@ -1,2 +1,3 @@ executable('netclock-replay', 'netclock-replay.c', - dependencies : [gio_dep, gst_dep, gst_net_dep]) + include_directories: libsinc, + dependencies : [gio_dep, gst_dep]) diff --git a/tests/misc/netclock-replay.c b/tests/misc/netclock-replay.c index f5dd67dce9..b7b741b3de 100644 --- a/tests/misc/netclock-replay.c +++ b/tests/misc/netclock-replay.c @@ -24,9 +24,12 @@ #include <stdio.h> +#define GST_NET_API /* empty */ + /* We need the internal netclock estimation function to (re)run the code on * captured samples, plus its dependencies for the build to succeed. */ #include "../../libs/gst/net/gstntppacket.c" +#include "../../libs/gst/net/gstnettimepacket.c" #include "../../libs/gst/net/gstnetclientclock.c" #include "../../libs/gst/net/gstnetutils.c" |