diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-10 14:07:08 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-10 14:07:08 +0000 |
commit | 7d4e8a36bbcac432c41780f0a753ee5723312124 (patch) | |
tree | a1160d56ac8f4935677ee24169b52b25e586aaca | |
parent | 7831dacd5d07fe84114e9fe37df63bb854eff168 (diff) | |
download | mpv-7d4e8a36bbcac432c41780f0a753ee5723312124.tar.bz2 mpv-7d4e8a36bbcac432c41780f0a753ee5723312124.tar.xz |
Support OpenAL headers in OpenAL/ instead of AL/ and OpenAL on MacOSX in general.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21572 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-x | configure | 14 | ||||
-rw-r--r-- | libao2/ao_openal.c | 8 |
2 files changed, 17 insertions, 5 deletions
@@ -4929,17 +4929,22 @@ echocheck "OpenAL" if test "$_openal" = auto ; then _openal=no cat > $TMPC << EOF +#ifdef OPENAL_AL_H +#include <OpenAL/al.h> +#else #include <AL/al.h> +#endif int main(void) { alSourceQueueBuffers(0, 0, 0); // alGetSourcei(0, AL_SAMPLE_OFFSET, 0); return 0; } EOF - if cc_check -lopenal ; then - _libs_mplayer="$_libs_mplayer -lopenal" - _openal=yes - fi + for I in "-lopenal" "-framework OpenAL" ; do + cc_check $I && _openal=yes && break + cc_check -DOPENAL_AL_H=1 $I && _def_openal_h='#define OPENAL_AL_H 1' && _openal=yes && break + done + test "$_openal" = yes && _libs_mplayer="$_libs_mplayer $I" fi if test "$_openal" = yes ; then _def_openal='#define USE_OPENAL 1' @@ -7916,6 +7921,7 @@ $_def_esd_latency $_def_polyp $_def_jack $_def_openal +$_def_openal_h $_def_sys_asoundlib_h $_def_alsa_asoundlib_h $_def_sunaudio diff --git a/libao2/ao_openal.c b/libao2/ao_openal.c index 62be52c322..bc2219c1ea 100644 --- a/libao2/ao_openal.c +++ b/libao2/ao_openal.c @@ -7,13 +7,19 @@ * Copyleft 2006 by Reimar Döffinger (Reimar.Doeffinger@stud.uni-karlsruhe.de) */ +#include "config.h" + #include <stdlib.h> #include <stdio.h> #include <inttypes.h> +#ifdef OPENAL_AL_H +#include <OpenAL/alc.h> +#include <OpenAL/al.h> +#else #include <AL/alc.h> #include <AL/al.h> +#endif -#include "config.h" #include "mp_msg.h" #include "help_mp.h" |