vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Sep 22 15:59:49 2013 +0300| [26b6b532120d1d49d9cfe8b1435d880c84c8e309] | committer: Rémi Denis-Courmont
aout: avoid genmf > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=26b6b532120d1d49d9cfe8b1435d880c84c8e309 --- configure.ac | 15 --------------- modules/audio_output/.gitignore | 1 - modules/audio_output/{Modules.am => Makefile.am} | 21 +++++++++++++++++---- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac index c949089..554b5c9 100644 --- a/configure.ac +++ b/configure.ac @@ -3556,18 +3556,6 @@ AS_IF([test "$enable_wasapi" != "no"], [ AM_CONDITIONAL([HAVE_WASAPI], [test "${have_wasapi}" = "yes"]) dnl -dnl win32 waveOut plugin -dnl -AC_ARG_ENABLE(waveout, - [ --enable-waveout Win32 waveOut module (default enabled on Win32)]) -if test "${enable_waveout}" != "no"; then - if test "${SYS}" = "mingw32"; then - VLC_ADD_PLUGIN([waveout]) - VLC_ADD_LIBS([waveout],[-lwinmm]) - fi -fi - -dnl dnl CoreAudio plugin dnl AC_ARG_ENABLE(macosx-audio, @@ -3577,7 +3565,6 @@ if test "x${enable_macosx_audio}" != "xno" && then AC_CHECK_HEADER([CoreAudio/CoreAudio.h], [ VLC_ADD_PLUGIN([auhal]) - VLC_ADD_LIBS([auhal],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,CoreServices]) ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ]) fi @@ -3590,7 +3577,6 @@ if test "${enable_ios_audio}" = "yes" then AC_CHECK_HEADER([AudioUnit/AudioUnit.h], [ VLC_ADD_PLUGIN([audiounit_ios]) - VLC_ADD_LIBS([audiounit_ios],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,CoreServices]) ], [ AC_MSG_ERROR([cannot find AudioUnit headers]) ]) fi @@ -3602,7 +3588,6 @@ AC_ARG_ENABLE(audioqueue, if test "${enable_audioqueue}" = "yes" then VLC_ADD_PLUGIN([audioqueue]) - VLC_ADD_LIBS([audioqueue], [-Wl,-framework,AudioToolbox,-framework,CoreFoundation]) fi dnl diff --git a/modules/audio_output/.gitignore b/modules/audio_output/.gitignore deleted file mode 100644 index 08a6d72..0000000 --- a/modules/audio_output/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Makefile.am diff --git a/modules/audio_output/Modules.am b/modules/audio_output/Makefile.am similarity index 68% rename from modules/audio_output/Modules.am rename to modules/audio_output/Makefile.am index 3894fe3..ff69d62 100644 --- a/modules/audio_output/Modules.am +++ b/modules/audio_output/Makefile.am @@ -1,10 +1,8 @@ aoutdir = $(pluginsdir)/audio_output aout_LTLIBRARIES = +EXTRA_LTLIBRARIES = -SOURCES_waveout = waveout.c windows_audio_common.h -SOURCES_auhal = TPCircularBuffer.h TPCircularBuffer.c auhal.c -SOURCES_audiounit_ios = TPCircularBuffer.h TPCircularBuffer.c audiounit_ios.c -SOURCES_audioqueue = audioqueue.c +include ../common.am libopensles_android_plugin_la_SOURCES = opensles_android.c libopensles_android_plugin_la_LIBADD = $(LIBDL) $(LIBM) @@ -79,3 +77,18 @@ libsndio_plugin_la_LIBADD = -lsndio if HAVE_SNDIO aout_LTLIBRARIES += libsndio_plugin.la endif + +libwaveout_plugin_la_SOURCES = waveout.c windows_audio_common.h +libwaveout_plugin_la_LIBADD = -lwinmm +if HAVE_WIN32 +aout_LTLIBRARIES += libwaveout_plugin.la +endif + +libauhal_plugin_la_SOURCES = TPCircularBuffer.h TPCircularBuffer.c auhal.c +libauhal_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,CoreServices -rpath '$(aoutdir)' +libaudiounit_ios_plugin_la_SOURCES = TPCircularBuffer.h TPCircularBuffer.c audiounit_ios.c +libaudiounit_ios_plugin_la_LDFLAGS = $(libauhal_plugin_la_LDFLAGS) +libaudioqueue_plugin_la_SOURCES = audioqueue.c +libaudioqueue_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,CoreServices -rpath '$(aoutdir)' +EXTRA_LTLIBRARIES += libauhal_plugin.la libaudiounit_ios_plugin.la libaudioqueue_plugin.la +aout_LTLIBRARIES += $(LTLIBauhal) $(LTLIBaudiounit_ios) $(LTLIBaudioqueue) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
