From 511a73c5ce80bd6ea2df1b6af028f194711eb3ce Mon Sep 17 00:00:00 2001 From: der richter Date: Fri, 20 Sep 2019 12:35:54 +0200 Subject: build: don't add swift object when swift disabled --- wscript_build.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'wscript_build.py') diff --git a/wscript_build.py b/wscript_build.py index 8e5b9a1b29..55924213cd 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -580,12 +580,16 @@ def build(ctx): syms = True ctx.load("syms") + additonal_objects = "" + if ctx.dependency_satisfied('swift'): + additonal_objects = "osdep/macOS_swift.o" + if ctx.dependency_satisfied('cplayer'): ctx( target = "mpv", source = main_fn_c, use = ctx.dependencies_use() + ['objects'], - add_object = "osdep/macOS_swift.o", + add_object = additonal_objects, includes = _all_includes(ctx), features = "c cprogram" + (" syms" if syms else ""), export_symbols_def = "libmpv/mpv.def", # for syms=True @@ -642,7 +646,7 @@ def build(ctx): "target": "mpv", "source": ctx.filtered_sources(sources), "use": ctx.dependencies_use(), - "add_object": "osdep/macOS_swift.o", + "add_object": additonal_objects, "includes": [ctx.bldnode.abspath(), ctx.srcnode.abspath()] + \ ctx.dependencies_includes(), "features": features, -- cgit v1.2.3