openal32: Add support for Mac OS X's OpenAL.framework.

This commit is contained in:
Ken Thomases 2009-09-09 22:23:35 -05:00 committed by Alexandre Julliard
parent 5ea23d616b
commit 0b08f19e03
4 changed files with 22 additions and 3 deletions

11
configure vendored
View File

@ -617,7 +617,6 @@ LDPATH
BUILTINFLAG BUILTINFLAG
EXTRACFLAGS EXTRACFLAGS
LIBKSTAT LIBKSTAT
LIBOPENAL
LIBMPG123 LIBMPG123
PNGINCL PNGINCL
FONTCONFIGINCL FONTCONFIGINCL
@ -655,6 +654,7 @@ CROSSTARGETFLAGS
CROSSTEST CROSSTEST
CROSSCC CROSSCC
CARBONLIB CARBONLIB
LIBOPENAL
COREAUDIO COREAUDIO
DISKARBITRATIONLIB DISKARBITRATIONLIB
LDEXECFLAGS LDEXECFLAGS
@ -2622,7 +2622,7 @@ fi
# Check whether --with-openal was given. # Check whether --with-openal was given.
if test "${with_openal+set}" = set; then : 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 fi
@ -5666,6 +5666,7 @@ for ac_header in \
DiskArbitration/DiskArbitration.h \ DiskArbitration/DiskArbitration.h \
IOKit/IOKitLib.h \ IOKit/IOKitLib.h \
IOKit/hid/IOHIDLib.h \ IOKit/hid/IOHIDLib.h \
OpenAL/al.h \
alias.h \ alias.h \
alsa/asoundlib.h \ alsa/asoundlib.h \
arpa/inet.h \ arpa/inet.h \
@ -6496,6 +6497,12 @@ fi
COREAUDIO="-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI" COREAUDIO="-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI"
fi 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" if test "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes"
then then
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"

View File

@ -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]), 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]) [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]), 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(opengl, AS_HELP_STRING([--without-opengl],[do not use OpenGL]))
AC_ARG_WITH(openssl, AS_HELP_STRING([--without-openssl],[do not use OpenSSL]), 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]) [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 \ DiskArbitration/DiskArbitration.h \
IOKit/IOKitLib.h \ IOKit/IOKitLib.h \
IOKit/hid/IOHIDLib.h \ IOKit/hid/IOHIDLib.h \
OpenAL/al.h \
alias.h \ alias.h \
alsa/asoundlib.h \ alsa/asoundlib.h \
arpa/inet.h \ arpa/inet.h \
@ -628,6 +629,11 @@ case $host_os in
dnl CoreServices needed by AudioUnit dnl CoreServices needed by AudioUnit
AC_SUBST(COREAUDIO,"-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI") AC_SUBST(COREAUDIO,"-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI")
fi 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" if test "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes"
then then
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"

View File

@ -32,6 +32,9 @@
#ifdef HAVE_AL_AL_H #ifdef HAVE_AL_AL_H
#include <AL/al.h> #include <AL/al.h>
#include <AL/alc.h> #include <AL/alc.h>
#elif defined(HAVE_OPENAL_AL_H)
#include <OpenAL/al.h>
#include <OpenAL/alc.h>
#endif #endif
WINE_DEFAULT_DEBUG_CHANNEL(openal32); WINE_DEFAULT_DEBUG_CHANNEL(openal32);

View File

@ -555,6 +555,9 @@
/* Define if mkdir takes only one argument */ /* Define if mkdir takes only one argument */
#undef HAVE_ONE_ARG_MKDIR #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 */ /* Define if OpenGL is present on the system */
#undef HAVE_OPENGL #undef HAVE_OPENGL