mirror of https://github.com/mpv-player/mpv
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:
parent
34e6a26f4d
commit
1d2910af95
5
wscript
5
wscript
|
@ -341,6 +341,11 @@ iconv support use --disable-iconv.",
|
||||||
'func': check_pkg_config('dvdnav', '>= 4.2.0',
|
'func': check_pkg_config('dvdnav', '>= 4.2.0',
|
||||||
'dvdread', '>= 4.1.0'),
|
'dvdread', '>= 4.1.0'),
|
||||||
'default': 'disable',
|
'default': 'disable',
|
||||||
|
}, {
|
||||||
|
'name': '--dvdread-common',
|
||||||
|
'desc': 'common dvdread code',
|
||||||
|
'deps_any': [ 'dvdread', 'dvdnav' ],
|
||||||
|
'func': check_true,
|
||||||
}, {
|
}, {
|
||||||
'name': '--cdda',
|
'name': '--cdda',
|
||||||
'desc': 'cdda support (libcdio)',
|
'desc': 'cdda support (libcdio)',
|
||||||
|
|
|
@ -259,10 +259,8 @@ def build(ctx):
|
||||||
( "stream/stream_bluray.c", "libbluray" ),
|
( "stream/stream_bluray.c", "libbluray" ),
|
||||||
( "stream/stream_cdda.c", "cdda" ),
|
( "stream/stream_cdda.c", "cdda" ),
|
||||||
( "stream/stream_dvb.c", "dvbin" ),
|
( "stream/stream_dvb.c", "dvbin" ),
|
||||||
( "stream/stream_dvd.c", "dvdread" ),
|
( "stream/stream_dvd.c", "dvdread-common" ),
|
||||||
( "stream/stream_dvd.c", "dvdnav" ),
|
( "stream/stream_dvd_common.c", "dvdread-common" ),
|
||||||
( "stream/stream_dvd_common.c", "dvdread" ),
|
|
||||||
( "stream/stream_dvd_common.c", "dvdnav" ),
|
|
||||||
( "stream/stream_dvdnav.c", "dvdnav" ),
|
( "stream/stream_dvdnav.c", "dvdnav" ),
|
||||||
( "stream/stream_edl.c" ),
|
( "stream/stream_edl.c" ),
|
||||||
( "stream/stream_file.c" ),
|
( "stream/stream_file.c" ),
|
||||||
|
|
Loading…
Reference in New Issue