From 0ca9937987ecf2bf3f579147ffc952838565415b Mon Sep 17 00:00:00 2001 From: Benjamin Radel Date: Fri, 28 Jun 2024 21:56:36 +0200 Subject: 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. --- wscript | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'wscript') diff --git a/wscript b/wscript index 5aeb4f1c3..d418ab6f4 100644 --- a/wscript +++ b/wscript @@ -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) -- cgit v1.2.3