From cfa9724a79736e6fcf308c2eea4687687e544b47 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 21 Nov 2014 01:47:30 +0100 Subject: build: don't build win32 mpv.com wrapper with --disable-cplayer It'll be useless. --- wscript_build.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'wscript_build.py') diff --git a/wscript_build.py b/wscript_build.py index 4bc703bc07..be6b783b86 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -427,6 +427,20 @@ def build(ctx): ctx.install_as(os.path.join(ctx.env.DOCDIR, f), os.path.join('etc/', f)) + if ctx.env.DEST_OS == 'win32': + wrapctx = ctx( + target = "mpv", + source = ['osdep/win32-console-wrapper.c'], + features = "c cprogram", + install_path = ctx.env.BINDIR + ) + + wrapctx.env.cprogram_PATTERN = "%s.com" + wrapflags = ['-municode', '-mconsole'] + wrapctx.env.CFLAGS = wrapflags + wrapctx.env.LAST_LINKFLAGS = wrapflags + + build_shared = ctx.dependency_satisfied('libmpv-shared') build_static = ctx.dependency_satisfied('libmpv-static') if build_shared or build_static: @@ -501,19 +515,6 @@ def build(ctx): install_path = None ) - if ctx.env.DEST_OS == 'win32': - wrapctx = ctx( - target = "mpv", - source = ['osdep/win32-console-wrapper.c'], - features = "c cprogram", - install_path = ctx.env.BINDIR - ) - - wrapctx.env.cprogram_PATTERN = "%s.com" - wrapflags = ['-municode', '-mconsole'] - wrapctx.env.CFLAGS = wrapflags - wrapctx.env.LAST_LINKFLAGS = wrapflags - if ctx.dependency_satisfied("vf-dlopen-filters"): dlfilters = "showqscale telecine tile rectangle framestep \ ildetect".split() -- cgit v1.2.3