diff options
| author | Michael Smith <msmith@songbirdnest.com> | 2009-04-08 11:52:46 -0700 |
|---|---|---|
| committer | Michael Smith <msmith@songbirdnest.com> | 2009-04-08 11:57:02 -0700 |
| commit | cacadf3f4d53412141e4537589fb15749109e6f4 (patch) | |
| tree | 957bd4ba177603e69f1854d4a71b223cf4435142 | |
| parent | 96d4ee808666374f82546f4629384b021f96190d (diff) | |
acmenc, acmmp3dec, sdp: link to all requires libraries on win32.
Add winsock for windows (for sdp). Link to all the plugins-base
libs we indirectly use for acmmenc and acmmp3dec.
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | sys/acmenc/Makefile.am | 26 | ||||
| -rw-r--r-- | sys/acmmp3dec/Makefile.am | 23 |
3 files changed, 35 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index e671123b8..cbf2c7b1e 100644 --- a/configure.ac +++ b/configure.ac @@ -328,6 +328,11 @@ dnl FIXME: maybe move to sys, or make work with winsock2 AC_CHECK_HEADERS([sys/socket.h], HAVE_SYS_SOCKET_H=yes) AC_CHECK_HEADERS([winsock2.h], HAVE_WINSOCK2_H=yes) +if test "x$HAVE_WINSOCK2_H" = "xyes"; then + WIN32_LIBS="-lws2_32" + AC_SUBST(WIN32_LIBS) +fi + dnl needed for festival AM_CONDITIONAL(HAVE_WINSOCK2_H, test "x$HAVE_WINSOCK2_H" = "xyes") diff --git a/sys/acmenc/Makefile.am b/sys/acmenc/Makefile.am index 587868bd5..eb1b603a6 100644 --- a/sys/acmenc/Makefile.am +++ b/sys/acmenc/Makefile.am @@ -1,10 +1,16 @@ -plugin_LTLIBRARIES = libgstacmencsink.la
-
-libgstacmencsink_la_SOURCES = acmenc.c
-libgstacmencsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
- $(GST_PLUGINS_BASE_CFLAGS) $(ACMENC_CFLAGS)
-libgstacmencsink_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
- -lgstriff-$(GST_MAJORMINOR) -lmsacm32
-libgstacmencsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstacmencsink_la_LIBTOOLFLAGS = --tag=disable-static
-
+plugin_LTLIBRARIES = libgstacmenc.la + +libgstacmenc_la_SOURCES = acmenc.c +libgstacmenc_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ + $(GST_PLUGINS_BASE_CFLAGS) $(ACMENC_CFLAGS) +libgstacmenc_la_LIBADD = \ + $(GST_BASE_LIBS) \ + $(GST_PLUGINS_BASE_LIBS) \ + -lgstriff-$(GST_MAJORMINOR) \ + -lgstaudio-$(GST_MAJORMINOR) \ + -lgsttag-$(GST_MAJORMINOR) \ + -lmsacm32 + +libgstacmenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstacmenc_la_LIBTOOLFLAGS = --tag=disable-static + diff --git a/sys/acmmp3dec/Makefile.am b/sys/acmmp3dec/Makefile.am index c1a28e75f..27c895c54 100644 --- a/sys/acmmp3dec/Makefile.am +++ b/sys/acmmp3dec/Makefile.am @@ -1,9 +1,14 @@ -plugin_LTLIBRARIES = libgstacmmp3dec.la
-
-libgstacmmp3dec_la_SOURCES = acmmp3dec.c
-libgstacmmp3dec_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
- $(GST_PLUGINS_BASE_CFLAGS) $(ACMMP3DEC_CFLAGS)
-libgstacmmp3dec_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
- -lgstriff-$(GST_MAJORMINOR) -lmsacm32
-libgstacmmp3dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTSOUND_LDFLAGS)
-
+plugin_LTLIBRARIES = libgstacmmp3dec.la + +libgstacmmp3dec_la_SOURCES = acmmp3dec.c +libgstacmmp3dec_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ + $(GST_PLUGINS_BASE_CFLAGS) $(ACMMP3DEC_CFLAGS) +libgstacmmp3dec_la_LIBADD = \ + $(GST_BASE_LIBS) \ + $(GST_PLUGINS_BASE_LIBS) \ + -lgstriff-$(GST_MAJORMINOR) \ + -lgstaudio-$(GST_MAJORMINOR) \ + -lgsttag-$(GST_MAJORMINOR) \ + -lmsacm32 +libgstacmmp3dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTSOUND_LDFLAGS) + |