Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zsolt Vadász
wine
Commits
0b08f19e
Commit
0b08f19e
authored
15 years ago
by
Ken Thomases
Committed by
Alexandre Julliard
15 years ago
Browse files
Options
Downloads
Patches
Plain Diff
openal32: Add support for Mac OS X's OpenAL.framework.
parent
5ea23d61
Loading
Loading
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
configure
+9
-2
9 additions, 2 deletions
configure
configure.ac
+7
-1
7 additions, 1 deletion
configure.ac
dlls/openal32/openal.c
+3
-0
3 additions, 0 deletions
dlls/openal32/openal.c
include/config.h.in
+3
-0
3 additions, 0 deletions
include/config.h.in
with
22 additions
and
3 deletions
configure
+
9
−
2
View file @
0b08f19e
...
...
@@ -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"
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
7
−
1
View file @
0b08f19e
...
...
@@ -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"
...
...
This diff is collapsed.
Click to expand it.
dlls/openal32/openal.c
+
3
−
0
View file @
0b08f19e
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
include/config.h.in
+
3
−
0
View file @
0b08f19e
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment