X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=be7b0f985df4f141cc84042ac47e4c12b5e191dd;hb=509da5ec56689f7ce5f1e114542f1abf3ccfb641;hp=64249b6f09aaeace751f202c52bb7f0e6f83c284;hpb=7038c43087a007548e9de5e07057a27fcf0f07e9;p=dcpomatic.git

diff --git a/wscript b/wscript
index 64249b6f0..be7b0f985 100644
--- a/wscript
+++ b/wscript
@@ -5,7 +5,7 @@ import distutils
 import distutils.spawn
 
 APPNAME = 'dcpomatic'
-VERSION = '2.0.21devel'
+VERSION = '2.0.41devel'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -61,9 +61,9 @@ def dynamic_openjpeg(conf):
     conf.check_cfg(package='libopenjpeg', args='--cflags --libs', max_version='1.5.2', mandatory=True)
 
 def static_sub(conf):
-    conf.check_cfg(package='libsub', atleast_version='0.01.0', args='--cflags', uselib_store='SUB', mandatory=True)
+    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)
@@ -96,7 +96,7 @@ def dynamic_dcp(conf):
     conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
 
 def dynamic_sub(conf):
-    conf.check_cfg(package='libsub', atleast_version='0.01.0', args='--cflags --libs', uselib_store='SUB', mandatory=True)
+    conf.check_cfg(package='libsub-1.0', atleast_version='1.0.0', args='--cflags --libs', uselib_store='SUB', mandatory=True)
     conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
 
 def dynamic_ssh(conf):
@@ -206,6 +206,7 @@ def configure(conf):
         conf.env.append_value('CXXFLAGS', '-DUNICODE')
         conf.env.append_value('CXXFLAGS', '-DBOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN')
         conf.env.append_value('CXXFLAGS', '-mfpmath=sse')
+        conf.env.append_value('CXXFLAGS', '-Wno-deprecated-declarations')
         wxrc = os.popen('wx-config --rescomp').read().split()[1:]
         conf.env.append_value('WINRCFLAGS', wxrc)
         if conf.options.enable_debug: