diff options
| author | Damien Lespiau <damien.lespiau@gmail.com> | 2008-12-29 15:54:44 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2008-12-29 15:54:44 +0000 |
| commit | 52b0e40115990074001fef41a779d45f49cca358 (patch) | |
| tree | 4be927f3c38f96676e1b1810bf4ea5f22cba1cb8 /gst/pcapparse | |
| parent | 231fcedd6dce08f8313b95c389288d021c257fb2 (diff) | |
| download | gst-plugins-bad-52b0e40115990074001fef41a779d45f49cca358.tar.gz gst-plugins-bad-52b0e40115990074001fef41a779d45f49cca358.tar.bz2 gst-plugins-bad-52b0e40115990074001fef41a779d45f49cca358.zip | |
gst/pcapparse/: Patch to make gstpcapparse compile with mingw32 gcc. Fixes #565439.
Original commit message from CVS:
Patch by: Damien Lespiau <damien dot lespiau at gmail dot com>
* gst/pcapparse/Makefile.am:
* gst/pcapparse/gstpcapparse.c:
Patch to make gstpcapparse compile with mingw32 gcc. Fixes #565439.
Diffstat (limited to 'gst/pcapparse')
| -rw-r--r-- | gst/pcapparse/Makefile.am | 9 | ||||
| -rw-r--r-- | gst/pcapparse/gstpcapparse.c | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gst/pcapparse/Makefile.am b/gst/pcapparse/Makefile.am index cd6f3dc7..838d7ad0 100644 --- a/gst/pcapparse/Makefile.am +++ b/gst/pcapparse/Makefile.am @@ -1,5 +1,12 @@ plugin_LTLIBRARIES = libgstpcapparse.la +# when compiling for windows we need to link with the winsock library +if HAVE_WINSOCK2_H + WINSOCK2_LIBS = -lws2_32 +else + WINSOCK2_LIBS = +endif + libgstpcapparse_la_SOURCES = \ gstpcapparse.c @@ -7,7 +14,7 @@ noinst_HEADERS = \ gstpcapparse.h libgstpcapparse_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) -libgstpcapparse_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) +libgstpcapparse_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(WINSOCK2_LIBS) libgstpcapparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstpcapparse_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/pcapparse/gstpcapparse.c b/gst/pcapparse/gstpcapparse.c index 2d323d3c..546ffbe3 100644 --- a/gst/pcapparse/gstpcapparse.c +++ b/gst/pcapparse/gstpcapparse.c @@ -48,7 +48,7 @@ #include <string.h> -#ifndef _MSC_VER +#ifndef G_OS_WIN32 #include <arpa/inet.h> #include <netinet/in.h> #include <string.h> |