diff options
| author | Benjamin Radel <benjamin@radel.tk> | 2024-06-28 21:56:36 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-06-30 16:17:18 +0200 |
| commit | 0ca9937987ecf2bf3f579147ffc952838565415b (patch) | |
| tree | 17ac30d3adef2e8a2dc5d2addbbbc0d8c4bc5644 /wscript | |
| parent | 3dbe0b9ff88a16b938ad6adf2c26179e278fa712 (diff) | |
Make DCPoMatic compatible with ICU >= 75
ICU >= 75 uses c++17 features and therefore requires compilation with
-std=c++17. However, this causes some namespace issues in
src/wx/file_picker_ctrl.cc and
src/wx/film_name_location_dialog.cc
between boost::optional, boost::filesystem and the corresponding
names from the std lib.
The patch fixes this namespace issues and adds a version check in
wscript to enable compilation with c++17, if icu >= 75 is detected.
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -252,6 +252,10 @@ def configure(conf): lib=['icuio', 'icui18n', 'icudata', 'icuuc'], uselib_store='ICU') + # For ICU version > 75 we need stdc++17 + if conf.check_cfg(modversion='icu-i18n') >= '75': + conf.env.append_value('CXXFLAGS', '-std=c++17') + # libsamplerate conf.check_cfg(package='samplerate', args='--cflags --libs', uselib_store='SAMPLERATE', mandatory=True) |
