summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-10-07 19:09:53 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-10-07 19:09:53 +0900
commit4457f8c9c8aea0dffa6fbbfd6caaa655da1c0094 (patch)
treebc1eea0f3a9b698067eb59d113ae3d9fe00e0df8 /configure.ac
parent0d7b967f45a9f1f4bd392fff4b69a9fca70616e5 (diff)
Revert "ecore_audio: a minimal template for playing sound on WINDOWS is added"
This reverts commit 7a98f617e94ef42787e06e685a8d5e7be34fff21. this commit breaks compiling things against efl badly. i'm on holiday and haver only a mini screen and keyboard wwith me so any serious wok in hunting these issues isn't going to be fun or easy. as this causes bad build brreaks this is worth a revert IMHO. please re-submit wwhen you've tested against efl by building things against it. also our public headers just should not have such ifdefs/if's that change api presented based on how efl is cnfigured. we expose the same api and macros and types regardless of internal config.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac22
1 files changed, 2 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac
index 93ecf88..ff49983 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3930,8 +3930,6 @@ want_alsa="no"
3930# TODO: and the EFL_OPTIONAL_DEPEND_PKG(), use EFL_DEPEND_PKG() 3930# TODO: and the EFL_OPTIONAL_DEPEND_PKG(), use EFL_DEPEND_PKG()
3931want_sndfile="yes" 3931want_sndfile="yes"
3932 3932
3933want_wasapiaudio="no"
3934
3935AC_ARG_ENABLE([pulseaudio], 3933AC_ARG_ENABLE([pulseaudio],
3936 [AS_HELP_STRING([--disable-pulseaudio],[disable pulseaudio sound support. @<:@default=enabled@:>@])], 3934 [AS_HELP_STRING([--disable-pulseaudio],[disable pulseaudio sound support. @<:@default=enabled@:>@])],
3937 [ 3935 [
@@ -3939,12 +3937,7 @@ AC_ARG_ENABLE([pulseaudio],
3939 want_pulseaudio="yes" 3937 want_pulseaudio="yes"
3940 else 3938 else
3941 want_pulseaudio="no" 3939 want_pulseaudio="no"
3942 if test "x${have_win32}" = "xyes" ; then 3940 CFOPT_WARNING="xyes"
3943 want_wasapiaudio="yes"
3944 else
3945 want_wasapiaudio="no"
3946 CFOPT_WARNING="xyes"
3947 fi
3948 fi 3941 fi
3949 ], 3942 ],
3950 [want_pulseaudio="yes"]) 3943 [want_pulseaudio="yes"])
@@ -3978,10 +3971,6 @@ if test "x${want_sndfile}" = "xyes" ; then
3978 PKG_CHECK_MODULES([ECORE_AUDIO_SNDFILE], [sndfile]) 3971 PKG_CHECK_MODULES([ECORE_AUDIO_SNDFILE], [sndfile])
3979 AC_DEFINE([HAVE_SNDFILE], [1], [Sndfile support]) 3972 AC_DEFINE([HAVE_SNDFILE], [1], [Sndfile support])
3980fi 3973fi
3981if test "x${want_wasapiaudio}" = "xyes" ; then
3982 EFL_ADD_LIBS([ECORE_AUDIO], [-luuid -lwinmm -lksuser])
3983 AC_DEFINE([HAVE_WASAPI], [1], [Wasapiaudio support])
3984fi
3985 3974
3986dnl EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO_ALSA], [${want_alsa}], [ALSA], [alsa]) 3975dnl EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO_ALSA], [${want_alsa}], [ALSA], [alsa])
3987dnl EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO_PULSE], [${want_pulseaudio}], [PULSE], [libpulse]) 3976dnl EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO_PULSE], [${want_pulseaudio}], [PULSE], [libpulse])
@@ -3992,7 +3981,6 @@ EFL_EVAL_PKGS([ECORE_AUDIO])
3992EFL_ADD_FEATURE([ECORE_AUDIO], [alsa]) 3981EFL_ADD_FEATURE([ECORE_AUDIO], [alsa])
3993EFL_ADD_FEATURE([ECORE_AUDIO], [pulseaudio]) 3982EFL_ADD_FEATURE([ECORE_AUDIO], [pulseaudio])
3994EFL_ADD_FEATURE([ECORE_AUDIO], [sndfile]) 3983EFL_ADD_FEATURE([ECORE_AUDIO], [sndfile])
3995EFL_ADD_FEATURE([ECORE_AUDIO], [wasapiaudio])
3996 3984
3997### Checks for header files 3985### Checks for header files
3998 3986
@@ -4009,7 +3997,6 @@ EFL_ADD_FEATURE([ECORE_AUDIO], [wasapiaudio])
4009EFL_LIB_END_OPTIONAL([Ecore_Audio]) 3997EFL_LIB_END_OPTIONAL([Ecore_Audio])
4010AM_CONDITIONAL([HAVE_ECORE_AUDIO_PULSE], [test "x${want_pulseaudio}" = "xyes"]) 3998AM_CONDITIONAL([HAVE_ECORE_AUDIO_PULSE], [test "x${want_pulseaudio}" = "xyes"])
4011AM_CONDITIONAL([HAVE_ECORE_AUDIO_SNDFILE], [test "x${want_sndfile}" = "xyes"]) 3999AM_CONDITIONAL([HAVE_ECORE_AUDIO_SNDFILE], [test "x${want_sndfile}" = "xyes"])
4012AM_CONDITIONAL([HAVE_ECORE_AUDIO_WASASPI], [test "x${want_wasapiaudio}" = "xyes"])
4013 4000
4014#### End of Ecore_Audio 4001#### End of Ecore_Audio
4015 4002
@@ -4777,13 +4764,8 @@ AC_ARG_ENABLE([multisense],
4777 if test "x${want_pulseaudio}" = "xyes"; then 4764 if test "x${want_pulseaudio}" = "xyes"; then
4778 want_multisense="yes" 4765 want_multisense="yes"
4779 else 4766 else
4780 if test "x${want_wasapiaudio}" = "xyes"; then 4767 want_multisense="no"
4781 want_multisense="yes"
4782 else
4783 want_multisense="no"
4784 fi
4785 fi 4768 fi
4786
4787 ]) 4769 ])
4788 4770
4789# TODO: should we keep or remove these? 4771# TODO: should we keep or remove these?