X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=52d6047b0d94e52a9495f688b93d0f335dd69ab8;hb=1c7805bddbe58dd829c59c559c6c62fe4c9a9302;hp=f346033c02d20ef5a84e1725c1cdc2d1bc0ccc2d;hpb=9a3bb0784f7cd1011e071eeea53b30f15c8dbe3c;p=dcpomatic.git diff --git a/wscript b/wscript index f346033c0..52d6047b0 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.10devel' +VERSION = '1.74.2' def options(opt): opt.load('compiler_cxx') @@ -84,7 +84,7 @@ def static_dcp(conf, static_boost, static_xmlpp, static_xmlsec, static_ssh): conf.env.LIB_DCP.append('ssh') def dynamic_dcp(conf): - conf.check_cfg(package='libdcp', atleast_version='0.95.0', args='--cflags --libs', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp', atleast_version='0.97.0', args='--cflags --libs', uselib_store='DCP', mandatory=True) conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] def dynamic_ssh(conf): @@ -182,7 +182,7 @@ def configure(conf): # Common CXXFLAGS conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-D__STDC_LIMIT_MACROS', '-msse', '-ffast-math', '-fno-strict-aliasing', - '-Wall', '-Wno-attributes', '-Wextra', '-D_FILE_OFFSET_BITS=64']) + '-Wall', '-Wno-attributes', '-Wextra', '-Wno-unused-result', '-D_FILE_OFFSET_BITS=64']) if conf.options.enable_debug: conf.env.append_value('CXXFLAGS', ['-g', '-DDCPOMATIC_DEBUG']) @@ -251,7 +251,7 @@ def configure(conf): # if conf.env.TARGET_DEBIAN: - conf.check_cfg(package='libcxml', atleast_version='0.08', args='--cflags', uselib_store='CXML', mandatory=True) + conf.check_cfg(package='libcxml', atleast_version='0.11', args='--cflags', uselib_store='CXML', mandatory=True) conf.env.STLIB_CXML = ['cxml'] conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XMLPP', mandatory=True) conf.check_cfg(package='libcurl', args='--cflags --libs', uselib_store='CURL', mandatory=True)