Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: make encoding mode non-optional

Browse Source 
Makes it easier to not break the build by confusing the ifdeffery.
This commit is contained in:
wm4
2018-04-29 20:03:24 +02:00
committed by Jan Ekström
parent 0ab3184526
commit e02c9b9902
10 changed files with 9 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wscript_build.py
View File

@@ -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(