diff options
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 33 |
1 files changed, 23 insertions, 10 deletions
@@ -59,7 +59,7 @@ def options(opt): opt.add_option('--target-windows-64', action='store_true', default=False, help='set up to do a cross-compile to Windows 64-bit') opt.add_option('--target-windows-32', action='store_true', default=False, help='set up to do a cross-compile to Windows 32-bit') opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation') - opt.add_option('--static', action='store_true', default=False, help='build libdcp statically, and link statically to openjpeg, cxml, asdcplib-carl') + opt.add_option('--static', action='store_true', default=False, help='build libdcp statically, and link statically to openjpeg, cxml, asdcplib-dcpomatic') opt.add_option('--static-boost', action='store_true', default=False, help='link statically to boost') opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests') opt.add_option('--disable-benchmarks', action='store_true', default=False, help='disable building of benchmarks') @@ -68,11 +68,20 @@ def options(opt): opt.add_option('--disable-dumpimage', action='store_true', default=False, help='disable building of dcpdumpimage') opt.add_option('--enable-openmp', action='store_true', default=False, help='enable use of OpenMP') opt.add_option('--openmp', default='gomp', help='specify OpenMP Library to use: omp, gomp (default), iomp') + opt.add_option('--c++17', action='store_true', default=False, help='build with C++17 and libxml++-4.0') def configure(conf): conf.load('compiler_cxx') conf.load('clang_compilation_database', tooldir=['waf-tools']) - conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-D_FILE_OFFSET_BITS=64', '-D__STDC_FORMAT_MACROS', '-std=c++11']) + + if vars(conf.options)['c++17']: + cpp_std = '17' + conf.env.XMLPP_API = '4.0' + else: + cpp_std = '11' + conf.env.XMLPP_API = '2.6' + + conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-D_FILE_OFFSET_BITS=64', '-D__STDC_FORMAT_MACROS', '-std=c++' + cpp_std]) gcc = conf.env['CC_VERSION'] if int(gcc[0]) >= 4 and int(gcc[1]) > 1: conf.env.append_value('CXXFLAGS', ['-Wno-maybe-uninitialized']) @@ -122,7 +131,7 @@ def configure(conf): conf.check(lib='dl', uselib_store='DL', msg='Checking for library dl') conf.check_cfg(package='openssl', args='--cflags --libs', uselib_store='OPENSSL', mandatory=True) - conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='LIBXML++', mandatory=True) + conf.check_cfg(package='libxml++-' + conf.env.XMLPP_API, args='--cflags --libs', uselib_store='LIBXML++', mandatory=True) conf.check_cfg(package='xmlsec1', args='--cflags --libs', uselib_store='XMLSEC1', mandatory=True) # Remove erroneous escaping of quotes from xmlsec1 defines conf.env.DEFINES_XMLSEC1 = [f.replace('\\', '') for f in conf.env.DEFINES_XMLSEC1] @@ -157,20 +166,20 @@ def configure(conf): if not patched_openjpeg: # We don't have our patched version so we need 2.5.0 to get the GUARD_BITS option - conf.check_cfg(package='libopenjp2', args='libopenjp2 >= 2.5.0', uselib_store='OPENJPEG', mandatory=True, msg='Checking for libopenjp2 >= 2.5.0') + conf.check_cfg(package='libopenjp2', args='libopenjp2 >= 2.5.0 --cflags --libs', uselib_store='OPENJPEG', mandatory=True, msg='Checking for libopenjp2 >= 2.5.0') if conf.options.static: conf.env.STLIB_OPENJPEG = ['openjp2'] - conf.check_cfg(package='libasdcp-carl', args='libasdcp-carl >= 0.1.3 --cflags', uselib_store='ASDCPLIB_CTH', mandatory=True) - conf.env.HAVE_ASDCPLIB_CTH = 1 - conf.env.STLIB_ASDCPLIB_CTH = ['asdcp-carl', 'kumu-carl'] + conf.check_cfg(package='libasdcp-dcpomatic', args='libasdcp-dcpomatic >= 0.1.3 --cflags', uselib_store='ASDCPLIB_DCPOMATIC', mandatory=True) + conf.env.HAVE_ASDCPLIB_DCPOMATIC = 1 + conf.env.STLIB_ASDCPLIB_DCPOMATIC = ['asdcp-dcpomatic', 'kumu-dcpomatic'] conf.env.HAVE_CXML = 1 - conf.env.LIB_CXML = ['xml++-2.6', 'glibmm-2.4'] + conf.env.LIB_CXML = ['xml++-' + conf.env.XMLPP_API, 'glibmm-2.4'] conf.env.STLIB_CXML = ['cxml'] conf.check_cfg(package='xerces-c', args='--cflags', uselib_store='XERCES', mandatory=True) conf.env.LIB_XERCES = ['xerces-c', 'icuuc', 'curl'] else: - conf.check_cfg(package='libasdcp-carl', args='libasdcp-carl >= 0.1.3 --cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True) + conf.check_cfg(package='libasdcp-dcpomatic', args='libasdcp-dcpomatic >= 0.1.3 --cflags --libs', uselib_store='ASDCPLIB_DCPOMATIC', mandatory=True) conf.check_cfg(package='libcxml', args='libcxml >= 0.17.0 --cflags --libs', uselib_store='CXML', mandatory=True) conf.check_cfg(package='xerces-c', args='--cflags --libs', uselib_store='XERCES', mandatory=True) @@ -254,6 +263,9 @@ def configure(conf): lib=['boost_date_time%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix], uselib_store='BOOST_DATETIME') + conf.check_cfg(package='libavcodec', args='--cflags --libs', uselib_store='AVCODEC', mandatory=True) + conf.check_cfg(package='libavutil', args='--cflags --libs', uselib_store='AVUTIL', mandatory=True) + if not conf.env.DISABLE_TESTS: conf.recurse('test') if conf.options.enable_gcov: @@ -278,7 +290,8 @@ def build(bld): version=VERSION, includedir='%s/include/libdcp%s' % (bld.env.PREFIX, bld.env.API_VERSION), libs=libs, - install_path='${LIBDIR}/pkgconfig') + install_path='${LIBDIR}/pkgconfig', + xmlpp_api=bld.env.XMLPP_ABI) bld.recurse('src') bld.recurse('tools') |