diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-05-05 18:20:33 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-05-05 18:20:33 +0100 |
| commit | b87f7345db2c998e37eae350ad880a2bb0d0f4cd (patch) | |
| tree | e04c6f0d0c66b732f827ff84ddf68a8fbe603b48 /gst | |
| parent | e4ec3e4bd70c4dabdeb7883101cd14ee43ec5e17 (diff) | |
| download | gstreamer-plugins-bad-b87f7345db2c998e37eae350ad880a2bb0d0f4cd.tar.gz | |
Add WINSOCK2_LIBS, remove WIN32_LIBS, fix rtmp build on Windows some more
One way of passing -lws2_32 to plugins should be enough..
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/dccp/Makefile.am | 2 | ||||
| -rw-r--r-- | gst/festival/Makefile.am | 6 | ||||
| -rw-r--r-- | gst/pcapparse/Makefile.am | 9 | ||||
| -rw-r--r-- | gst/sdp/Makefile.am | 2 |
4 files changed, 3 insertions, 16 deletions
diff --git a/gst/dccp/Makefile.am b/gst/dccp/Makefile.am index 41e6ca174..781ef0e6a 100644 --- a/gst/dccp/Makefile.am +++ b/gst/dccp/Makefile.am @@ -12,7 +12,7 @@ libgstdccp_la_SOURCES = gstdccpplugin.c \ # flags used to compile this plugin libgstdccp_la_CFLAGS = $(GST_CFLAGS) -libgstdccp_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(DCCP_LIBS) +libgstdccp_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(DCCP_LIBS) $(WINSOCK2_LIBS) libgstdccp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstdccp_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/festival/Makefile.am b/gst/festival/Makefile.am index e1a62ac27..cb8959dc4 100644 --- a/gst/festival/Makefile.am +++ b/gst/festival/Makefile.am @@ -1,12 +1,6 @@ plugin_LTLIBRARIES = libgstfestival.la -if HAVE_WINSOCK2_H -WINSOCK2_LIBS = -lws2_32 -else -WINSOCK2_LIBS = -endif - libgstfestival_la_SOURCES = gstfestival.c libgstfestival_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) # we use net connection now... perhaps use the lib later diff --git a/gst/pcapparse/Makefile.am b/gst/pcapparse/Makefile.am index 6c357f209..1c56fe869 100644 --- a/gst/pcapparse/Makefile.am +++ b/gst/pcapparse/Makefile.am @@ -1,12 +1,5 @@ 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 gstirtspparse.c plugin.c @@ -30,4 +23,4 @@ Android.mk: Makefile.am $(BUILT_SOURCES) -ldl \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ - > $@
\ No newline at end of file + > $@ diff --git a/gst/sdp/Makefile.am b/gst/sdp/Makefile.am index 90a822d03..b506f284a 100644 --- a/gst/sdp/Makefile.am +++ b/gst/sdp/Makefile.am @@ -5,7 +5,7 @@ libgstsdpelem_la_SOURCES = gstsdpelem.c gstsdpdemux.h gstsdpdemux.c libgstsdpelem_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS) libgstsdpelem_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GIO_LIBS) \ -lgstrtp-@GST_API_VERSION@ -lgstsdp-@GST_API_VERSION@ \ - $(GST_LIBS) $(WIN32_LIBS) + $(GST_LIBS) $(WINSOCK2_LIBS) libgstsdpelem_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstsdpelem_la_LIBTOOLFLAGS = --tag=disable-static |