mirror of
https://github.com/mpv-player/mpv
synced 2024-12-25 08:12:17 +00:00
Revert "ao_openal: enable building on OSX"
This reverts commit af6126adbe
. Apple's
OpenAL support is ridiculously out of date, revert back to just using
OpenAL Soft on macOS (fixes #4645).
This commit is contained in:
parent
1890ca024e
commit
91786fa99c
@ -24,19 +24,6 @@
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <inttypes.h>
|
||||
|
||||
#ifdef __APPLE__
|
||||
#ifndef AL_FORMAT_MONO_FLOAT32
|
||||
#define AL_FORMAT_MONO_FLOAT32 0x10010
|
||||
#endif
|
||||
#ifndef AL_FORMAT_STEREO_FLOAT32
|
||||
#define AL_FORMAT_STEREO_FLOAT32 0x10011
|
||||
#endif
|
||||
#ifndef AL_FORMAT_MONO_DOUBLE_EXT
|
||||
#define AL_FORMAT_MONO_DOUBLE_EXT 0x10012
|
||||
#endif
|
||||
#include <OpenAL/MacOSX_OALExtensions.h>
|
||||
#else
|
||||
#ifdef OPENAL_AL_H
|
||||
#include <OpenAL/alc.h>
|
||||
#include <OpenAL/al.h>
|
||||
@ -46,7 +33,6 @@
|
||||
#include <AL/al.h>
|
||||
#include <AL/alext.h>
|
||||
#endif
|
||||
#endif // __APPLE__
|
||||
|
||||
#include "common/msg.h"
|
||||
|
||||
|
@ -4,7 +4,7 @@ from waflib import Utils
|
||||
import os
|
||||
|
||||
__all__ = ["check_pthreads", "check_iconv", "check_lua",
|
||||
"check_cocoa", "check_openal", "check_wl_protocols"]
|
||||
"check_cocoa", "check_wl_protocols"]
|
||||
|
||||
pthreads_program = load_fragment('pthreads.c')
|
||||
|
||||
@ -111,14 +111,3 @@ def check_cocoa(ctx, dependency_identifier):
|
||||
])
|
||||
|
||||
return res
|
||||
|
||||
def check_openal(ctx, dependency_identifier):
|
||||
checks = [
|
||||
check_pkg_config('openal', '>= 1.13'),
|
||||
check_statement(['OpenAL/AL.h'], 'int i = AL_VERSION', framework='OpenAL')
|
||||
]
|
||||
|
||||
for fn in checks:
|
||||
if fn(ctx, dependency_identifier):
|
||||
return True
|
||||
return False
|
||||
|
Loading…
Reference in New Issue
Block a user