From 9284543ab9fdbd691bb4feed701b0ef9b56bf257 Mon Sep 17 00:00:00 2001 From: Aman Gupta Date: Wed, 23 Jan 2019 16:10:00 -0800 Subject: wscript_build: de-duplicate build file list --- wscript_build.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'wscript_build.py') diff --git a/wscript_build.py b/wscript_build.py index 7e63f6bdf8..9c372a1115 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -234,12 +234,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" ), -- cgit v1.2.3 From 6ce570359aa06469d3ead822227058ec87c86b30 Mon Sep 17 00:00:00 2001 From: Akemi Date: Wed, 26 Sep 2018 15:33:34 +0200 Subject: cocoa-cb: add support for VOCTRL_GET_DISPLAY_NAMES --- wscript_build.py | 1 + 1 file changed, 1 insertion(+) (limited to 'wscript_build.py') diff --git a/wscript_build.py b/wscript_build.py index 9c372a1115..db4be186b0 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" ), -- cgit v1.2.3