from waflib import Logs, Context
APPNAME = 'dcpomatic'
-libdcp_version = '1.8.5'
-libsub_version = '1.6.5'
+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]
conf.env.DISABLE_GUI = conf.options.disable_gui
conf.env.DISABLE_TESTS = conf.options.disable_tests
conf.env.TARGET_WINDOWS_64 = conf.options.target_windows_64
- conf.env.TARGET_WINDOWS_32 = conf.options.target_windows_64
+ conf.env.TARGET_WINDOWS_32 = conf.options.target_windows_32
conf.env.TARGET_OSX = sys.platform == 'darwin'
conf.env.TARGET_LINUX = not conf.env.TARGET_WINDOWS_64 and not conf.env.TARGET_WINDOWS_32 and not conf.env.TARGET_OSX
conf.env.VERSION = VERSION
if int(gcc[0]) >= 8:
# I tried and failed to ignore these with _Pragma
conf.env.append_value('CXXFLAGS', ['-Wno-cast-function-type'])
- 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'])
- else:
- have_c11 = False
+ if int(gcc[0]) > 4:
+ # gcc 4.8.5 on Centos 7 does not have this warning
+ conf.env.append_value('CXXFLAGS', ['-Wsuggest-override'])
if conf.options.enable_debug:
conf.env.append_value('CXXFLAGS', ['-g', '-DDCPOMATIC_DEBUG', '-fno-omit-frame-pointer'])
conf.check(lib='winmm', uselib_store='WINMM', msg="Checking for library winmm")
conf.check(lib='ksuser', uselib_store='KSUSER', msg="Checking for library ksuser")
conf.check(lib='setupapi', uselib_store='SETUPAPI', msg="Checking for library setupapi")
+ conf.check(lib='uuid', uselib_store='UUID', msg="Checking for library uuid")
boost_lib_suffix = '-mt-x32' if conf.options.target_windows_32 else '-mt-x64'
boost_thread = 'boost_thread' + boost_lib_suffix
conf.check_cxx(fragment="""
# libpng
conf.check_cfg(package='libpng', args='--cflags --libs', uselib_store='PNG', mandatory=True)
+ # libjpeg
+ conf.check_cxx(fragment="""
+ #include <cstddef>
+ #include <cstdio>
+ #include <jpeglib.h>
+ 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="""