Commit 59385bde authored by Tim-Philipp Müller's avatar Tim-Philipp Müller 🐠
Browse files

ext/cdio/Makefile.am: Add GST_BASE_CFLAGS and GST_BASE_LIBS (seems to be...

ext/cdio/Makefile.am: Add GST_BASE_CFLAGS and GST_BASE_LIBS (seems to be required for Cygwin, see #317048)

Original commit message from CVS:
* ext/cdio/Makefile.am:
Add GST_BASE_CFLAGS and GST_BASE_LIBS (seems to be
required for Cygwin, see #317048)
* gst/rtp/gstasteriskh263.c:
Cygwin has includes for both the unix network socket API
and the windows API, but only one can be included, so fix
includes to only use one or the other, prefering the unxi
one (#317048).
parent 8449839a
2006-02-23 Tim-Philipp Müller <tim at centricular dot net>
* ext/cdio/Makefile.am:
Add GST_BASE_CFLAGS and GST_BASE_LIBS (seems to be
required for Cygwin, see #317048)
* gst/rtp/gstasteriskh263.c:
Cygwin has includes for both the unix network socket API
and the windows API, but only one can be included, so fix
includes to only use one or the other, prefering the unxi
one (#317048).
2006-02-23 Philippe Kalaf <philippe.kalaf at collabora.co.uk>
* rtp/gst/gstrtppcmadepay.c:
......
......@@ -8,10 +8,12 @@ libgstcdio_la_SOURCES = \
libgstcdio_la_CFLAGS = \
$(GST_PLUGINS_BASE_CFLAGS) \
$(CDIO_CFLAGS) \
$(GST_BASE_CFLAGS) \
$(GST_CFLAGS)
libgstcdio_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) -lgstcdda-@GST_MAJORMINOR@ \
$(GST_BASE_LIBS) \
$(CDIO_LIBS)
libgstcdio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
......
......@@ -21,13 +21,15 @@
#include <gst/rtp/gstrtpbuffer.h>
#include "gstasteriskh263.h"
/* Cygwin has both netinet/in.h and winsock2.h, but
* only one can be included, so prefer the unix one */
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
#else
#ifdef HAVE_WINSOCK2_H
# include <winsock2.h>
#endif
#endif
#define GST_ASTERISKH263_HEADER_LEN 6
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment