diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-01-21 20:14:44 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-21 20:14:44 +0100 |
| commit | 948df331b6e32774415c9412bbe0e1d935b65c93 (patch) | |
| tree | e74ec2c9fc2022c1f466ad018b6e3ab81d6e40aa | |
| parent | a9d68327a3092adc44d669ede1bfb1fa2f9cf872 (diff) | |
| parent | af2520ec862edea39ac9d96c1fe8754ea2714bd4 (diff) | |
Merge.
| -rw-r--r-- | src/dcp_reader.cc | 2 | ||||
| -rw-r--r-- | wscript | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/dcp_reader.cc b/src/dcp_reader.cc index 5f57746..6c35c05 100644 --- a/src/dcp_reader.cc +++ b/src/dcp_reader.cc @@ -73,7 +73,7 @@ DCPReader::DCPReader (boost::filesystem::path file) for (auto i: sc->subtitles()) { /* We don't deal with image subs */ - auto is = dynamic_pointer_cast<dcp::SubtitleString>(i); + auto is = dynamic_pointer_cast<const dcp::SubtitleString>(i); if (!is) { continue; } @@ -101,6 +101,9 @@ def configure(conf): else: conf.env.append_value('CXXFLAGS', '-O3') + if not conf.env.TARGET_WINDOWS: + conf.env.append_value('LINKFLAGS', '-pthread') + # Disable libxml++ deprecation warnings for now conf.env.append_value('CXXFLAGS', ['-Wno-deprecated-declarations']) @@ -109,8 +112,8 @@ def configure(conf): if conf.options.static: conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.2', args='--cflags', uselib_store='DCP', mandatory=True) conf.env.HAVE_DCP = 1 - conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-carl', 'kumu-carl', 'openjp2'] - conf.env.LIB_DCP = ['ssl', 'crypto', 'xmlsec1-openssl', 'xmlsec1'] + conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-carl', 'kumu-carl', 'openjp2', 'cxml'] + conf.env.LIB_DCP = ['ssl', 'crypto', 'xmlsec1-openssl', 'xmlsec1', 'glibmm-2.4', 'xml++-2.6', 'xml2'] else: conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.2', args='--cflags --libs', uselib_store='DCP', mandatory=True) |