X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=c0d337d801f446a5ee150f783e0d821bcf2e7f4e;hb=99881b1bec17a7e619b3cbf3f51d4d43e7215561;hp=60be947eb1a6c1b9a48d0502078f40e477c2e588;hpb=2b0cf17f9a20729f8d43541ee405164b3806c038;p=dcpomatic.git diff --git a/wscript b/wscript index 60be947eb..c0d337d80 100644 --- a/wscript +++ b/wscript @@ -35,8 +35,8 @@ except ImportError: from waflib import Logs, Context APPNAME = 'dcpomatic' -libdcp_version = '1.8.12' -libsub_version = '1.6.12' +libdcp_version = '1.8.13' +libsub_version = '1.6.13' this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0] last_version = subprocess.Popen(shlex.split('git describe --tags --match v* --abbrev=0'), stdout=subprocess.PIPE).communicate()[0] @@ -129,6 +129,7 @@ def configure(conf): have_c11 = int(gcc[0]) >= 4 and int(gcc[1]) >= 8 and int(gcc[2]) >= 1 # Most gccs still give these warnings from boost::optional conf.env.append_value('CXXFLAGS', ['-Wno-maybe-uninitialized']) + conf.env.append_value('CXXFLAGS', ['-Wsuggest-override']) else: have_c11 = False @@ -347,6 +348,18 @@ def configure(conf): # libpng conf.check_cfg(package='libpng', args='--cflags --libs', uselib_store='PNG', mandatory=True) + # libjpeg + conf.check_cxx(fragment=""" + #include + #include + #include + int main() { struct jpeg_compress_struct compress; jpeg_create_compress (&compress); return 0; } + """, + msg='Checking for libjpeg', + libpath='/usr/local/lib', + lib=['jpeg'], + uselib_store='JPEG') + # lwext4 if conf.options.enable_disk: conf.check_cxx(fragment="""