Missing deps and a missing API version on static libsub.
authorCarl Hetherington <cth@carlh.net>
Mon, 22 Dec 2014 01:58:35 +0000 (01:58 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 22 Dec 2014 01:58:35 +0000 (01:58 +0000)
src/wx/wscript
wscript

index 10d6f4f1d20eda67b5bb99acd425c5b25b4b5622..fa3dfb21dfb1132dcca58cfb2e25ba70bea957c0 100644 (file)
@@ -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 28ec3727477818dcd15b8bdb37420128fced5376..1ec7db1722ab887a3505201a232a0ead694e6aff 100644 (file)
--- 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)