diff options
| author | Jan Ekström <jeebjp@gmail.com> | 2019-03-11 01:00:27 +0200 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2019-03-11 01:00:27 +0200 |
| commit | 199aabddcc0105b504cc8e0cb240bc3c89288c1a (patch) | |
| tree | fa7eb297a8e11b5e0d9339196f23918d6a4d0b85 /wscript_build.py | |
| parent | 7c565547b80fdc2a1bfdf31f9725129bcb16aa9d (diff) | |
| parent | 1d0349d3b5d9a263251fcb3b0d7e135d4731bfd0 (diff) | |
| download | mpv-199aabddcc0105b504cc8e0cb240bc3c89288c1a.tar.bz2 mpv-199aabddcc0105b504cc8e0cb240bc3c89288c1a.tar.xz | |
Merge branch 'master' into pr6360
Manual changes done:
* Merged the interface-changes under the already master'd changes.
* Moved the hwdec-related option changes to video/decode/vd_lavc.c.
Diffstat (limited to 'wscript_build.py')
| -rw-r--r-- | wscript_build.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/wscript_build.py b/wscript_build.py index 091f938275..e08a7fe3f4 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -164,6 +164,7 @@ def build(ctx): if ctx.dependency_satisfied('macos-cocoa-cb'): swift_source = [ ( "osdep/macOS_mpv_helper.swift" ), + ( "osdep/macOS_swift_extensions.swift" ), ( "video/out/cocoa-cb/events_view.swift" ), ( "video/out/cocoa-cb/video_layer.swift" ), ( "video/out/cocoa-cb/window.swift" ), @@ -234,12 +235,10 @@ def build(ctx): ( "audio/out/ao_alsa.c", "alsa" ), ( "audio/out/ao_audiounit.m", "audiounit" ), ( "audio/out/ao_coreaudio.c", "coreaudio" ), - ( "audio/out/ao_coreaudio_chmap.c", "audiounit" ), - ( "audio/out/ao_coreaudio_chmap.c", "coreaudio" ), + ( "audio/out/ao_coreaudio_chmap.c", "coreaudio || audiounit" ), ( "audio/out/ao_coreaudio_exclusive.c", "coreaudio" ), ( "audio/out/ao_coreaudio_properties.c", "coreaudio" ), - ( "audio/out/ao_coreaudio_utils.c", "audiounit" ), - ( "audio/out/ao_coreaudio_utils.c", "coreaudio" ), + ( "audio/out/ao_coreaudio_utils.c", "coreaudio || audiounit" ), ( "audio/out/ao_jack.c", "jack" ), ( "audio/out/ao_lavc.c" ), ( "audio/out/ao_null.c" ), |