From 23a0a79f3f572ce8310e795c786f375c0073a8d2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 22 Dec 2014 01:58:35 +0000 Subject: [PATCH] Missing deps and a missing API version on static libsub. --- src/wx/wscript | 2 +- wscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wx/wscript b/src/wx/wscript index 10d6f4f1d..fa3dfb21d 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -90,7 +90,7 @@ def build(bld): obj.name = 'libdcpomatic2-wx' obj.export_includes = ['..'] - obj.uselib = 'WXWIDGETS DCP' + obj.uselib = 'WXWIDGETS DCP SUB' if bld.env.TARGET_LINUX: obj.uselib += ' GTK' obj.use = 'libdcpomatic2' diff --git a/wscript b/wscript index 28ec37274..1ec7db172 100644 --- a/wscript +++ b/wscript @@ -63,7 +63,7 @@ def dynamic_openjpeg(conf): def static_sub(conf): conf.check_cfg(package='libsub-1.0', atleast_version='1.0.0', args='--cflags', uselib_store='SUB', mandatory=True) conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB] - conf.env.STLIB_SUB = ['sub'] + conf.env.STLIB_SUB = ['sub-1.0'] def static_dcp(conf, static_boost, static_xmlpp, static_xmlsec, static_ssh): conf.check_cfg(package='libdcp-1.0', atleast_version='1.0', args='--cflags', uselib_store='DCP', mandatory=True) -- 2.30.2