diff options
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 17 |
1 files changed, 6 insertions, 11 deletions
@@ -78,9 +78,9 @@ def options(opt): opt.add_option('--warnings-are-errors', action='store_true', default=False, help='build with -Werror') opt.add_option('--wx-config', help='path to wx-config') opt.add_option('--enable-asan', action='store_true', help='build with asan') - opt.add_option('--disable-more-warnings', action='store_true', default=False, help='disable some warnings raised by Xcode 15 with the 2.16 branch') opt.add_option('--c++17', action='store_true', default=False, help='build with C++17 and libxml++-4.0') opt.add_option('--variant', help="build with variant") + opt.add_option('--developer', action='store_true', default=False, help='find resources (e.g. bitmaps) when running from the source tree') def configure(conf): conf.load('compiler_cxx') @@ -137,15 +137,6 @@ def configure(conf): '-D_FILE_OFFSET_BITS=64', '-std=c++' + cpp_std]) - if conf.options.disable_more_warnings: - # These are for Xcode 15.0.1 with the v2.16.x-era - # dependencies; maybe they aren't necessary when building - # v2.1{7,8}.x - conf.env.append_value('CXXFLAGS', ['-Wno-deprecated-builtins', - '-Wno-deprecated-declarations', - '-Wno-enum-constexpr-conversion', - '-Wno-deprecated-copy']) - if conf.options.warnings_are_errors: conf.env.append_value('CXXFLAGS', '-Werror') @@ -186,6 +177,9 @@ def configure(conf): if conf.options.enable_grok: conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_GROK') + if conf.options.developer: + conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_DEVELOPER') + if conf.options.use_lld: try: conf.find_program('ld.lld') @@ -402,7 +396,7 @@ def configure(conf): check_via_pkg_config(conf, 'libdcp-1.0', 'DCP', mandatory=True, static=True, minimum_version=libdcp_version) conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-dcpomatic', 'kumu-dcpomatic', 'openjp2'] - conf.env.LIB_DCP = ['glibmm-' + conf.env.GLIBMM_API, 'ssl', 'crypto', 'bz2', 'xslt', 'xerces-c', 'fmt', 'hpdf'] + conf.env.LIB_DCP = ['glibmm-' + conf.env.GLIBMM_API, 'ssl', 'crypto', 'bz2', 'xslt', 'xerces-c', 'fmt', 'hpdf', 'xml2'] else: check_via_pkg_config(conf, 'libdcp-1.0', 'DCP', mandatory=True, static=False, minimum_version=libdcp_version) conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] @@ -766,6 +760,7 @@ def build(bld): bld.recurse('src') bld.recurse('graphics') bld.recurse('web') + bld.recurse('benchmark') if not bld.env.DISABLE_TESTS: bld.recurse('test') |