diff options
| author | Ricardo Constantino <wiiaboo@gmail.com> | 2017-03-31 20:17:01 +0100 |
|---|---|---|
| committer | Ricardo Constantino <wiiaboo@gmail.com> | 2017-03-31 20:17:01 +0100 |
| commit | 1d2910af95f8084bb7ff2d4058fbf8084d4c52b3 (patch) | |
| tree | 4836029600d77b5e819790c674fce37d74ac04ef | |
| parent | 34e6a26f4d5ae06019d121b77c84ac84aa7069a1 (diff) | |
| download | mpv-1d2910af95f8084bb7ff2d4058fbf8084d4c52b3.tar.bz2 mpv-1d2910af95f8084bb7ff2d4058fbf8084d4c52b3.tar.xz | |
wscript: fix broken build with dvdread+dvdnav in 34e6a26
Didn't know waf actually tried to compile the same files twice.
| -rw-r--r-- | wscript | 5 | ||||
| -rw-r--r-- | wscript_build.py | 6 |
2 files changed, 7 insertions, 4 deletions
@@ -342,6 +342,11 @@ iconv support use --disable-iconv.", '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)', 'func': check_pkg_config('libcdio_paranoia'), 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" ), |