From 1d2910af95f8084bb7ff2d4058fbf8084d4c52b3 Mon Sep 17 00:00:00 2001 From: Ricardo Constantino Date: Fri, 31 Mar 2017 20:17:01 +0100 Subject: wscript: fix broken build with dvdread+dvdnav in 34e6a26 Didn't know waf actually tried to compile the same files twice. --- wscript | 5 +++++ wscript_build.py | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/wscript b/wscript index 472856eb09..1dd00eb0db 100644 --- a/wscript +++ b/wscript @@ -341,6 +341,11 @@ iconv support use --disable-iconv.", 'func': check_pkg_config('dvdnav', '>= 4.2.0', 'dvdread', '>= 4.1.0'), 'default': 'disable', + }, { + 'name': '--dvdread-common', + 'desc': 'common dvdread code', + 'deps_any': [ 'dvdread', 'dvdnav' ], + 'func': check_true, }, { 'name': '--cdda', 'desc': 'cdda support (libcdio)', diff --git a/wscript_build.py b/wscript_build.py index e6f31ffc0d..8155018a12 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -259,10 +259,8 @@ def build(ctx): ( "stream/stream_bluray.c", "libbluray" ), ( "stream/stream_cdda.c", "cdda" ), ( "stream/stream_dvb.c", "dvbin" ), - ( "stream/stream_dvd.c", "dvdread" ), - ( "stream/stream_dvd.c", "dvdnav" ), - ( "stream/stream_dvd_common.c", "dvdread" ), - ( "stream/stream_dvd_common.c", "dvdnav" ), + ( "stream/stream_dvd.c", "dvdread-common" ), + ( "stream/stream_dvd_common.c", "dvdread-common" ), ( "stream/stream_dvdnav.c", "dvdnav" ), ( "stream/stream_edl.c" ), ( "stream/stream_file.c" ), -- cgit v1.2.3