vlc | branch: master | Rémi Denis-Courmont <r...@remlab.net> | Tue May 15 23:55:19 2012 +0300| [13ea0ab33bdd6401dc097c0584eabf490bab8d45] | committer: Rémi Denis-Courmont
wasapi: build system integration > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=13ea0ab33bdd6401dc097c0584eabf490bab8d45 --- configure.ac | 19 +++++++++++++++++++ modules/audio_output/Modules.am | 4 +++- 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 92d598c..7ae9362 100644 --- a/configure.ac +++ b/configure.ac @@ -3497,6 +3497,25 @@ AS_IF([test "$enable_sndio" != "no"], [ AM_CONDITIONAL([HAVE_SNDIO], [test "${have_sndio}" = "yes"]) dnl +dnl Windows Audio Session plugin +dnl +AC_ARG_ENABLE([wasapi], + [AS_HELP_STRING([--enable-wasapi], + [use the Windows Audio Session API (default auto)]) +]) +have_wasapi="no" +AS_IF([test "$enable_wasapi" != "no"], [ + AC_CHECK_HEADER([audioclient.h], [ + have_wasapi="yes" + ], [ + AS_IF([test "x${enable_wasapi}" != "x"], [ + AC_MSG_ERROR([Windows Audio Session API not found.]) + ]) + ]) +]) +AM_CONDITIONAL([HAVE_WASAPI], [test "${have_wasapi}" = "yes"]) + +dnl dnl win32 waveOut plugin dnl AC_ARG_ENABLE(waveout, diff --git a/modules/audio_output/Modules.am b/modules/audio_output/Modules.am index f6a1dac..ea30d4d 100644 --- a/modules/audio_output/Modules.am +++ b/modules/audio_output/Modules.am @@ -49,7 +49,9 @@ libwasapi_plugin_la_SOURCES = wasapi.c libwasapi_plugin_la_CFLAGS = $(AM_CFLAGS) libwasapi_plugin_la_LIBADD = $(AM_LIBADD) -lole32 -lksuser libwasapi_plugin_la_DEPENDENCIES = -EXTRA_LTLIBRARIES += libwasapi_plugin.la +if HAVE_WASAPI +libvlc_LTLIBRARIES += libwasapi_plugin.la +endif libkai_plugin_la_SOURCES = kai.c packet.c libkai_plugin_la_CFLAGS = $(AM_CFLAGS) _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
