From 6ff59b2f6e36596ee6f347da307de9b61ff92bdd Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Mon, 14 Nov 2005 02:13:35 +0000 Subject: rework configure.ac; make asterisk rtp stuff compile on mingw Original commit message from CVS: rework configure.ac; make asterisk rtp stuff compile on mingw --- gst/rtp/Makefile.am | 8 +++++++- gst/rtp/gstasteriskh263.c | 9 ++++++++- gst/rtp/gstrtp.c | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) (limited to 'gst/rtp') diff --git a/gst/rtp/Makefile.am b/gst/rtp/Makefile.am index b4af38ff..877dbefa 100644 --- a/gst/rtp/Makefile.am +++ b/gst/rtp/Makefile.am @@ -20,9 +20,15 @@ libgstrtp_la_SOURCES = \ #gstrtpL16enc.c gstrtpL16parse.c gstrtpgsmenc.c gstrtpgsmparse.c +if HAVE_WINSOCK2_H +WINSOCK2_LIBS = -lws2_32 +else +WINSOCK2_LIBS = +endif + libgstrtp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstrtp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \ - -lgstrtp-@GST_MAJORMINOR@ + -lgstrtp-@GST_MAJORMINOR@ $(WINSOCK2_LIBS) libgstrtp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstrtpL16enc.h \ diff --git a/gst/rtp/gstasteriskh263.c b/gst/rtp/gstasteriskh263.c index 2c27e15e..e38abea3 100644 --- a/gst/rtp/gstasteriskh263.c +++ b/gst/rtp/gstasteriskh263.c @@ -17,11 +17,18 @@ #endif #include -#include #include #include "gstasteriskh263.h" +#ifdef HAVE_NETINET_IN_H +# include +#endif + +#ifdef HAVE_WINSOCK2_H +# include +#endif + #define GST_ASTERISKH263_HEADER_LEN 6 typedef struct _GstAsteriskH263Header diff --git a/gst/rtp/gstrtp.c b/gst/rtp/gstrtp.c index dd8457b4..07a77e48 100644 --- a/gst/rtp/gstrtp.c +++ b/gst/rtp/gstrtp.c @@ -92,4 +92,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, "rtp", "Real-time protocol plugins", - plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN) + plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) -- cgit