RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

wscript: fix broken build with dvdread+dvdnav in 34e6a26 

Didn't know waf actually tried to compile the same files twice.
This commit is contained in:
Ricardo Constantino 2017-03-31 20:17:01 +01:00
parent 34e6a26f4d
commit 1d2910af95
No known key found for this signature in database
GPG Key ID: EFD16019AE4FF531
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wscript
View File

@ -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)',

6
wscript_build.py
View File

@ -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" ),