Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
26b6b532
Commit
26b6b532
authored
Sep 22, 2013
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aout: avoid genmf
parent
eb91162e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
20 deletions
+17
-20
configure.ac
configure.ac
+0
-15
modules/audio_output/.gitignore
modules/audio_output/.gitignore
+0
-1
modules/audio_output/Makefile.am
modules/audio_output/Makefile.am
+17
-4
No files found.
configure.ac
View file @
26b6b532
...
@@ -3555,18 +3555,6 @@ AS_IF([test "$enable_wasapi" != "no"], [
...
@@ -3555,18 +3555,6 @@ AS_IF([test "$enable_wasapi" != "no"], [
])
])
AM_CONDITIONAL([HAVE_WASAPI], [test "${have_wasapi}" = "yes"])
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
dnl CoreAudio plugin
dnl CoreAudio plugin
dnl
dnl
...
@@ -3577,7 +3565,6 @@ if test "x${enable_macosx_audio}" != "xno" &&
...
@@ -3577,7 +3565,6 @@ if test "x${enable_macosx_audio}" != "xno" &&
then
then
AC_CHECK_HEADER([CoreAudio/CoreAudio.h],
AC_CHECK_HEADER([CoreAudio/CoreAudio.h],
[ VLC_ADD_PLUGIN([auhal])
[ VLC_ADD_PLUGIN([auhal])
VLC_ADD_LIBS([auhal],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,CoreServices])
], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ])
], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ])
fi
fi
...
@@ -3590,7 +3577,6 @@ if test "${enable_ios_audio}" = "yes"
...
@@ -3590,7 +3577,6 @@ if test "${enable_ios_audio}" = "yes"
then
then
AC_CHECK_HEADER([AudioUnit/AudioUnit.h],
AC_CHECK_HEADER([AudioUnit/AudioUnit.h],
[ VLC_ADD_PLUGIN([audiounit_ios])
[ 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]) ])
], [ AC_MSG_ERROR([cannot find AudioUnit headers]) ])
fi
fi
...
@@ -3602,7 +3588,6 @@ AC_ARG_ENABLE(audioqueue,
...
@@ -3602,7 +3588,6 @@ AC_ARG_ENABLE(audioqueue,
if test "${enable_audioqueue}" = "yes"
if test "${enable_audioqueue}" = "yes"
then
then
VLC_ADD_PLUGIN([audioqueue])
VLC_ADD_PLUGIN([audioqueue])
VLC_ADD_LIBS([audioqueue], [-Wl,-framework,AudioToolbox,-framework,CoreFoundation])
fi
fi
dnl
dnl
...
...
modules/audio_output/.gitignore
deleted
100644 → 0
View file @
eb91162e
Makefile.am
modules/audio_output/M
odules
.am
→
modules/audio_output/M
akefile
.am
View file @
26b6b532
aoutdir
=
$(pluginsdir)
/audio_output
aoutdir
=
$(pluginsdir)
/audio_output
aout_LTLIBRARIES
=
aout_LTLIBRARIES
=
EXTRA_LTLIBRARIES
=
SOURCES_waveout = waveout.c windows_audio_common.h
include
../common.am
SOURCES_auhal = TPCircularBuffer.h TPCircularBuffer.c auhal.c
SOURCES_audiounit_ios = TPCircularBuffer.h TPCircularBuffer.c audiounit_ios.c
SOURCES_audioqueue = audioqueue.c
libopensles_android_plugin_la_SOURCES
=
opensles_android.c
libopensles_android_plugin_la_SOURCES
=
opensles_android.c
libopensles_android_plugin_la_LIBADD
=
$(LIBDL)
$(LIBM)
libopensles_android_plugin_la_LIBADD
=
$(LIBDL)
$(LIBM)
...
@@ -79,3 +77,18 @@ libsndio_plugin_la_LIBADD = -lsndio
...
@@ -79,3 +77,18 @@ libsndio_plugin_la_LIBADD = -lsndio
if
HAVE_SNDIO
if
HAVE_SNDIO
aout_LTLIBRARIES
+=
libsndio_plugin.la
aout_LTLIBRARIES
+=
libsndio_plugin.la
endif
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)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment