diff options
| -rw-r--r-- | cscript | 5 | ||||
| -rw-r--r-- | wscript | 11 |
2 files changed, 8 insertions, 8 deletions
@@ -36,7 +36,7 @@ import shutil def dependencies(target, options): deps = [ - ('libcxml', 'v0.17.11', options), + ('libcxml', '7d5f7579ab6882d0e306c9cee58df320a33e7fa0', options), ('openjpeg', 'ad8edaacd54a862940d0a77c41ecda5858b54d6e'), ('asdcplib', 'v1.0.3') ] @@ -67,6 +67,9 @@ def build(target, options): if 'c++17' in options and options['c++17']: cmd += ' --c++17' + if 'new_mm' in options and options['new_mm']: + cmd += ' --new-mm' + if target.debug: cmd += ' --enable-debug' @@ -68,18 +68,15 @@ 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') + opt.add_option('--c++17', action='store_true', default=False, help='build with C++17') + opt.add_option('--new-mm', action='store_true', default=False, help='build with libxml++-4.0') def configure(conf): conf.load('compiler_cxx') conf.load('clang_compilation_database', tooldir=['waf-tools']) - 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' + cpp_std = '17' if vars(conf.options)['c++17'] else '11' + conf.env.XMLPP_API = '4.0' if vars(conf.options)['new_mm'] else '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'] |