mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
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).
This commit is contained in:
Tim-Philipp Müller 2006-02-23 20:08:58 +00:00
parent 8449839ab1
commit 59385bde70
3 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
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:

2
ext/cdio/Makefile.am
View file

@ -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)

6
gst/rtp/gstasteriskh263.c
View file

@ -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