summaryrefslogtreecommitdiffstats
path: root/wscript_build.py
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-04-29 20:03:24 +0200
committerJan Ekström <jeebjp@gmail.com>2018-05-03 01:08:44 +0300
commite02c9b9902f5bd356088cfbff3b9c333e50f1e47 (patch)
tree511c7b99c4288cab58d313f29caba78e4f8fdce1 /wscript_build.py
parent0ab3184526e7b9b95c06a3ec7a6674283a5922d0 (diff)
downloadmpv-e02c9b9902f5bd356088cfbff3b9c333e50f1e47.tar.bz2
mpv-e02c9b9902f5bd356088cfbff3b9c333e50f1e47.tar.xz
build: make encoding mode non-optional
Makes it easier to not break the build by confusing the ifdeffery.
Diffstat (limited to 'wscript_build.py')
-rw-r--r--wscript_build.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/wscript_build.py b/wscript_build.py
index c55758f213..dd90eafb84 100644
--- a/wscript_build.py
+++ b/wscript_build.py
@@ -241,7 +241,7 @@ def build(ctx):
( "audio/out/ao_coreaudio_utils.c", "audiounit" ),
( "audio/out/ao_coreaudio_utils.c", "coreaudio" ),
( "audio/out/ao_jack.c", "jack" ),
- ( "audio/out/ao_lavc.c", "encoding" ),
+ ( "audio/out/ao_lavc.c" ),
( "audio/out/ao_null.c" ),
( "audio/out/ao_openal.c", "openal" ),
( "audio/out/ao_opensles.c", "opensles" ),
@@ -262,7 +262,7 @@ def build(ctx):
( "common/av_log.c" ),
( "common/codecs.c" ),
( "common/common.c" ),
- ( "common/encode_lavc.c", "encoding" ),
+ ( "common/encode_lavc.c" ),
( "common/msg.c" ),
( "common/playlist.c" ),
( "common/recorder.c" ),
@@ -484,7 +484,7 @@ def build(ctx):
( "video/out/vo_drm.c", "drm" ),
( "video/out/vo_gpu.c" ),
( "video/out/vo_image.c" ),
- ( "video/out/vo_lavc.c", "encoding" ),
+ ( "video/out/vo_lavc.c" ),
( "video/out/vo_libmpv.c" ),
( "video/out/vo_mediacodec_embed.c", "android" ),
( "video/out/vo_null.c" ),
@@ -730,8 +730,7 @@ def build(ctx):
ctx.env.DATADIR + '/applications',
['etc/mpv.desktop'] )
- if ctx.dependency_satisfied('encoding'):
- ctx.install_files(ctx.env.CONFDIR, ['etc/encoding-profiles.conf'] )
+ ctx.install_files(ctx.env.CONFDIR, ['etc/encoding-profiles.conf'] )
for size in '16x16 32x32 64x64'.split():
ctx.install_as(