Module: wine Branch: master Commit: 0b08f19e032fdc4ac55174aac60f7f168c04daa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b08f19e032fdc4ac55174aac6...
Author: Ken Thomases ken@codeweavers.com Date: Wed Sep 9 22:23:35 2009 -0500
openal32: Add support for Mac OS X's OpenAL.framework.
---
configure | 11 +++++++++-- configure.ac | 8 +++++++- dlls/openal32/openal.c | 3 +++ include/config.h.in | 3 +++ 4 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/configure b/configure index 329b243..59f988e 100755 --- a/configure +++ b/configure @@ -617,7 +617,6 @@ LDPATH BUILTINFLAG EXTRACFLAGS LIBKSTAT -LIBOPENAL LIBMPG123 PNGINCL FONTCONFIGINCL @@ -655,6 +654,7 @@ CROSSTARGETFLAGS CROSSTEST CROSSCC CARBONLIB +LIBOPENAL COREAUDIO DISKARBITRATIONLIB LDEXECFLAGS @@ -2622,7 +2622,7 @@ fi
# Check whether --with-openal was given. if test "${with_openal+set}" = set; then : - withval=$with_openal; if test "x$withval" = "xno"; then ac_cv_header_AL_al_h=no; fi + withval=$with_openal; if test "x$withval" = "xno"; then ac_cv_header_AL_al_h=no; ac_cv_header_OpenAL_al_h=no; fi fi
@@ -5666,6 +5666,7 @@ for ac_header in \ DiskArbitration/DiskArbitration.h \ IOKit/IOKitLib.h \ IOKit/hid/IOHIDLib.h \ + OpenAL/al.h \ alias.h \ alsa/asoundlib.h \ arpa/inet.h \ @@ -6496,6 +6497,12 @@ fi COREAUDIO="-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI"
fi + if test "$ac_cv_header_OpenAL_al_h" = "yes" + then + LIBOPENAL="-framework OpenAL" + + ac_cv_lib_openal_alGetSource3i=yes + fi if test "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" then ac_save_LIBS="$LIBS" diff --git a/configure.ac b/configure.ac index adec95f..ba9a454 100644 --- a/configure.ac +++ b/configure.ac @@ -54,7 +54,7 @@ AC_ARG_WITH(mpg123, AS_HELP_STRING([--without-mpg123],[do not use the mpg123 AC_ARG_WITH(nas, AS_HELP_STRING([--without-nas],[do not use the NAS sound support]), [if test "x$withval" = "xno"; then ac_cv_header_audio_audiolib_h=no; fi]) AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]), - [if test "x$withval" = "xno"; then ac_cv_header_AL_al_h=no; fi]) + [if test "x$withval" = "xno"; then ac_cv_header_AL_al_h=no; ac_cv_header_OpenAL_al_h=no; fi]) AC_ARG_WITH(opengl, AS_HELP_STRING([--without-opengl],[do not use OpenGL])) AC_ARG_WITH(openssl, AS_HELP_STRING([--without-openssl],[do not use OpenSSL]), [if test "x$withval" = "xno"; then ac_cv_header_openssl_err_h=no; ac_cv_header_openssl_ssl_h=no; fi]) @@ -303,6 +303,7 @@ AC_CHECK_HEADERS(\ DiskArbitration/DiskArbitration.h \ IOKit/IOKitLib.h \ IOKit/hid/IOHIDLib.h \ + OpenAL/al.h \ alias.h \ alsa/asoundlib.h \ arpa/inet.h \ @@ -628,6 +629,11 @@ case $host_os in dnl CoreServices needed by AudioUnit AC_SUBST(COREAUDIO,"-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI") fi + if test "$ac_cv_header_OpenAL_al_h" = "yes" + then + AC_SUBST(LIBOPENAL,"-framework OpenAL") + ac_cv_lib_openal_alGetSource3i=yes + fi if test "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" then ac_save_LIBS="$LIBS" diff --git a/dlls/openal32/openal.c b/dlls/openal32/openal.c index fb5a47c..75654fc 100644 --- a/dlls/openal32/openal.c +++ b/dlls/openal32/openal.c @@ -32,6 +32,9 @@ #ifdef HAVE_AL_AL_H #include <AL/al.h> #include <AL/alc.h> +#elif defined(HAVE_OPENAL_AL_H) +#include <OpenAL/al.h> +#include <OpenAL/alc.h> #endif
WINE_DEFAULT_DEBUG_CHANNEL(openal32); diff --git a/include/config.h.in b/include/config.h.in index 161a41c..d072380 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -555,6 +555,9 @@ /* Define if mkdir takes only one argument */ #undef HAVE_ONE_ARG_MKDIR
+/* Define to 1 if you have the <OpenAL/al.h> header file. */ +#undef HAVE_OPENAL_AL_H + /* Define if OpenGL is present on the system */ #undef HAVE_OPENGL