summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2017-12-13 10:04:49 -0800
committerCedric BAIL <cedric@osg.samsung.com>2017-12-13 10:27:48 -0800
commit53c548a97e8e4274758e6a54b42aa5bea5c68e01 (patch)
tree725db74535a412b0082d8e0cd5184f938fa338e6 /configure.ac
parent71e5c74eb6919114a9a96d8c282e7b931d20981f (diff)
Revert "Revert "ecore_audio: a minimal template for playing sound on WINDOWS is added""
This reverts commit 4457f8c9c8aea0dffa6fbbfd6caaa655da1c0094.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac22
1 files changed, 20 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index b5ce7cc..c399877 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4025,6 +4025,8 @@ want_alsa="no"
4025# TODO: and the EFL_OPTIONAL_DEPEND_PKG(), use EFL_DEPEND_PKG() 4025# TODO: and the EFL_OPTIONAL_DEPEND_PKG(), use EFL_DEPEND_PKG()
4026want_sndfile="yes" 4026want_sndfile="yes"
4027 4027
4028want_wasapiaudio="no"
4029
4028AC_ARG_ENABLE([pulseaudio], 4030AC_ARG_ENABLE([pulseaudio],
4029 [AS_HELP_STRING([--disable-pulseaudio],[disable pulseaudio sound support. @<:@default=enabled@:>@])], 4031 [AS_HELP_STRING([--disable-pulseaudio],[disable pulseaudio sound support. @<:@default=enabled@:>@])],
4030 [ 4032 [
@@ -4032,7 +4034,12 @@ AC_ARG_ENABLE([pulseaudio],
4032 want_pulseaudio="yes" 4034 want_pulseaudio="yes"
4033 else 4035 else
4034 want_pulseaudio="no" 4036 want_pulseaudio="no"
4035 CFOPT_WARNING="xyes" 4037 if test "x${have_win32}" = "xyes" ; then
4038 want_wasapiaudio="yes"
4039 else
4040 want_wasapiaudio="no"
4041 CFOPT_WARNING="xyes"
4042 fi
4036 fi 4043 fi
4037 ], 4044 ],
4038 [want_pulseaudio="yes"]) 4045 [want_pulseaudio="yes"])
@@ -4066,6 +4073,10 @@ if test "x${want_sndfile}" = "xyes" ; then
4066 PKG_CHECK_MODULES([ECORE_AUDIO_SNDFILE], [sndfile]) 4073 PKG_CHECK_MODULES([ECORE_AUDIO_SNDFILE], [sndfile])
4067 AC_DEFINE([HAVE_SNDFILE], [1], [Sndfile support]) 4074 AC_DEFINE([HAVE_SNDFILE], [1], [Sndfile support])
4068fi 4075fi
4076if test "x${want_wasapiaudio}" = "xyes" ; then
4077 EFL_ADD_LIBS([ECORE_AUDIO], [-luuid -lwinmm -lksuser])
4078 AC_DEFINE([HAVE_WASAPI], [1], [Wasapiaudio support])
4079fi
4069 4080
4070dnl EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO_ALSA], [${want_alsa}], [ALSA], [alsa]) 4081dnl EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO_ALSA], [${want_alsa}], [ALSA], [alsa])
4071dnl EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO_PULSE], [${want_pulseaudio}], [PULSE], [libpulse]) 4082dnl EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO_PULSE], [${want_pulseaudio}], [PULSE], [libpulse])
@@ -4076,6 +4087,7 @@ EFL_EVAL_PKGS([ECORE_AUDIO])
4076EFL_ADD_FEATURE([ECORE_AUDIO], [alsa]) 4087EFL_ADD_FEATURE([ECORE_AUDIO], [alsa])
4077EFL_ADD_FEATURE([ECORE_AUDIO], [pulseaudio]) 4088EFL_ADD_FEATURE([ECORE_AUDIO], [pulseaudio])
4078EFL_ADD_FEATURE([ECORE_AUDIO], [sndfile]) 4089EFL_ADD_FEATURE([ECORE_AUDIO], [sndfile])
4090EFL_ADD_FEATURE([ECORE_AUDIO], [wasapiaudio])
4079 4091
4080### Checks for header files 4092### Checks for header files
4081 4093
@@ -4092,6 +4104,7 @@ EFL_ADD_FEATURE([ECORE_AUDIO], [sndfile])
4092EFL_LIB_END_OPTIONAL([Ecore_Audio]) 4104EFL_LIB_END_OPTIONAL([Ecore_Audio])
4093AM_CONDITIONAL([HAVE_ECORE_AUDIO_PULSE], [test "x${want_pulseaudio}" = "xyes"]) 4105AM_CONDITIONAL([HAVE_ECORE_AUDIO_PULSE], [test "x${want_pulseaudio}" = "xyes"])
4094AM_CONDITIONAL([HAVE_ECORE_AUDIO_SNDFILE], [test "x${want_sndfile}" = "xyes"]) 4106AM_CONDITIONAL([HAVE_ECORE_AUDIO_SNDFILE], [test "x${want_sndfile}" = "xyes"])
4107AM_CONDITIONAL([HAVE_ECORE_AUDIO_WASASPI], [test "x${want_wasapiaudio}" = "xyes"])
4095 4108
4096#### End of Ecore_Audio 4109#### End of Ecore_Audio
4097 4110
@@ -4859,8 +4872,13 @@ AC_ARG_ENABLE([multisense],
4859 if test "x${want_pulseaudio}" = "xyes"; then 4872 if test "x${want_pulseaudio}" = "xyes"; then
4860 want_multisense="yes" 4873 want_multisense="yes"
4861 else 4874 else
4862 want_multisense="no" 4875 if test "x${want_wasapiaudio}" = "xyes"; then
4876 want_multisense="yes"
4877 else
4878 want_multisense="no"
4879 fi
4863 fi 4880 fi
4881
4864 ]) 4882 ])
4865 4883
4866# TODO: should we keep or remove these? 4884# TODO: should we keep or remove these?