diff options
| author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2011-12-26 22:22:59 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-12-26 22:22:59 +0000 |
| commit | e72b55b6ac84ae5748ea3e462802a96a71b4acca (patch) | |
| tree | cd2a24d1f7aeb2e308004b4c4d46e2dc534d0c93 | |
| parent | 7202d37c9d2c566f49d035489e04ddecec16b33d (diff) | |
waveform: add autotools bits for waveform plugin
https://bugzilla.gnome.org/show_bug.cgi?id=666485
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | sys/Makefile.am | 8 | ||||
| -rw-r--r-- | sys/waveform/Makefile.am | 10 |
3 files changed, 17 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 70fc56677..681bc37ef 100644 --- a/configure.ac +++ b/configure.ac @@ -444,6 +444,12 @@ int main () AC_SUBST(HAVE_DIRECTSOUND) ]) +dnl *** Win32 WaveOut *** +translit(dnm, m, l) AM_CONDITIONAL(USE_WAVEFORM, true) +AG_GST_CHECK_FEATURE(WAVEFORM, [Win32 WaveForm], waveformsink, [ + AC_CHECK_HEADER(mmsystem.h, HAVE_WAVEFORM="yes", HAVE_WAVEFORM="no", [#include <windows.h>]) +]) + dnl *** OSS audio *** (Linux, *BSD) translit(dnm, m, l) AM_CONDITIONAL(USE_OSS, true) AG_GST_CHECK_FEATURE(OSS, [OSS audio], ossaudio, [ @@ -1046,6 +1052,7 @@ AM_CONDITIONAL(USE_SOUP, false) AM_CONDITIONAL(USE_SPEEX, false) AM_CONDITIONAL(USE_SUNAUDIO, false) AM_CONDITIONAL(USE_TAGLIB, false) +AM_CONDITIONAL(USE_WAVEFORM, false) AM_CONDITIONAL(USE_WAVPACK, false) AM_CONDITIONAL(USE_X, false) AM_CONDITIONAL(USE_XSHM, false) diff --git a/sys/Makefile.am b/sys/Makefile.am index ab08d046d..7ccd9e77a 100644 --- a/sys/Makefile.am +++ b/sys/Makefile.am @@ -23,6 +23,12 @@ else DIRECTSOUND_DIR= endif +if USE_WAVEFORM +WAVEFORM_DIR=waveform +else +WAVEFORM_DIR= +endif + if USE_SUNAUDIO SUNAUDIO_DIR=sunaudio else @@ -77,7 +83,7 @@ else XIMAGE_DIR= endif -SUBDIRS=$(DIRECTSOUND_DIR) $(OSS_DIR) $(OSS4_DIR) $(OSX_AUDIO_DIR) $(OSX_VIDEO_DIR) $(SUNAUDIO_DIR) $(V4L2_DIR) $(XIMAGE_DIR) +SUBDIRS=$(DIRECTSOUND_DIR) $(WAVEFORM_DIR) $(OSS_DIR) $(OSS4_DIR) $(OSX_AUDIO_DIR) $(OSX_VIDEO_DIR) $(SUNAUDIO_DIR) $(V4L2_DIR) $(XIMAGE_DIR) DIST_SUBDIRS=directsound oss oss4 osxaudio osxvideo sunaudio v4l2 waveform ximage diff --git a/sys/waveform/Makefile.am b/sys/waveform/Makefile.am index a9562a818..9a9fac3d7 100644 --- a/sys/waveform/Makefile.am +++ b/sys/waveform/Makefile.am @@ -1,19 +1,15 @@ plugin_LTLIBRARIES = libgstwaveformsink.la -# FIXME: Replace DIRECTSOUND CFLAGS+LIBS with waveform related ones and fix -# the configure.ac + sys/Makefile.am to get this stuff building in MingW -# For now, it's just disted for use in the VS builds. - libgstwaveformsink_la_SOURCES = gstwaveformsink.c gstwaveformplugin.c libgstwaveformsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ - $(GST_PLUGINS_BASE_CFLAGS) $(DIRECTSOUND_CFLAGS) + $(GST_PLUGINS_BASE_CFLAGS) libgstwaveformsink_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) \ -lgstaudio-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ - $(DIRECTSOUND_LIBS) -libgstwaveformsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTSOUND_LDFLAGS) + -lwinmm +libgstwaveformsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstwaveformsink_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = gstwaveformsink.h |