opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests')
opt.add_option('--target-windows-64', action='store_true', default=False, help='set up to do a cross-compile for Windows 64-bit')
opt.add_option('--target-windows-32', action='store_true', default=False, help='set up to do a cross-compile for Windows 32-bit')
- opt.add_option('--target-macos-arm64', action='store_true', default=False, help='set up to do a cross-compile for macOS arm64')
opt.add_option('--static-dcpomatic', action='store_true', default=False, help='link to components of DCP-o-matic statically')
opt.add_option('--static-boost', action='store_true', default=False, help='link statically to Boost')
opt.add_option('--static-wxwidgets', action='store_true', default=False, help='link statically to wxWidgets')
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')
def configure(conf):
conf.load('compiler_cxx')
if conf.options.target_windows_64 or conf.options.target_windows_32:
conf.load('winres')
+ if vars(conf.options)['c++17']:
+ cpp_std = '17'
+ conf.env.XMLPP_API = '4.0'
+ conf.env.PANGOMM_API = '2.48'
+ conf.env.CAIROMM_API = '1.16'
+ else:
+ cpp_std = '11'
+ conf.env.XMLPP_API = '2.6'
+ conf.env.PANGOMM_API = '1.4'
+ conf.env.CAIROMM_API = '1.0'
+
# Save conf.options that we need elsewhere in conf.env
conf.env.DISABLE_GUI = conf.options.disable_gui
conf.env.DISABLE_TESTS = conf.options.disable_tests
else:
conf.env.INSTALL_PREFIX = conf.options.destdir
+ conf.check_cxx(cxxflags=['-msse', '-mfpmath=sse'], msg='Checking for SSE support', mandatory=False, define_name='SSE')
+
# Common CXXFLAGS
conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS',
'-D__STDC_LIMIT_MACROS',
'-Wall',
'-Wextra',
'-Wwrite-strings',
- '-Wno-error=deprecated',
# getMessengerLogger() in the grok code triggers these warnings
'-Wno-nonnull',
+ '-Wno-error=deprecated',
# I tried and failed to ignore these with _Pragma
'-Wno-ignored-qualifiers',
'-D_FILE_OFFSET_BITS=64',
- '-std=c++11'])
+ '-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')
- if not conf.options.target_macos_arm64:
- conf.env.append_value('CXXFLAGS', '-msse')
+ if conf.env.SSE:
+ conf.env.append_value('CXXFLAGS', ['-msse', '-mfpmath=sse'])
if conf.options.enable_asan:
conf.env.append_value('CXXFLAGS', '-fsanitize=address')
conf.env.append_value('CXXFLAGS', ['-Wno-cast-function-type'])
# Most gccs still give these warnings from boost::optional
conf.env.append_value('CXXFLAGS', ['-Wno-maybe-uninitialized'])
- if int(gcc[0]) > 4:
+ if int(gcc[0]) > 8:
# gcc 4.8.5 on Centos 7 does not have this warning
+ # gcc 7.5.0 on Ubuntu 18.04 and gcc 8.3.0 on Debian 10 do, but
+ # I didn't manage to turn it back off again with a pragma
conf.env.append_value('CXXFLAGS', ['-Wsuggest-override'])
if conf.options.enable_debug:
conf.env.append_value('CXXFLAGS', '-DWIN32_LEAN_AND_MEAN')
conf.env.append_value('CXXFLAGS', '-DBOOST_USE_WINDOWS_H')
conf.env.append_value('CXXFLAGS', '-DBOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN')
- conf.env.append_value('CXXFLAGS', '-mfpmath=sse')
conf.env.append_value('CXXFLAGS', '-Wcast-align')
wxrc = os.popen('wx-config --rescomp').read().split()[1:]
conf.env.append_value('WINRCFLAGS', wxrc)
# Linux
if conf.env.TARGET_LINUX:
- conf.env.append_value('CXXFLAGS', '-mfpmath=sse')
conf.env.append_value('CXXFLAGS', '-DLINUX_LOCALE_PREFIX="%s/share/locale"' % conf.env['INSTALL_PREFIX'])
conf.env.append_value('CXXFLAGS', '-DLINUX_SHARE_PREFIX="%s/share"' % conf.env['INSTALL_PREFIX'])
conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_LINUX')
if conf.env.TARGET_OSX:
conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_OSX', '-DGL_SILENCE_DEPRECATION'])
conf.env.append_value('LINKFLAGS', '-headerpad_max_install_names')
+ conf.env.append_value('LINKFLAGS', '-llzma')
#
# Dependencies.
uselib="ZIP",
define_name='DCPOMATIC_HAVE_ZIP_FILE_ADD'
)
+ conf.check_cxx(fragment="""
+ #include <zip.h>
+ int main() { int error; zip_open("foo", ZIP_RDONLY, &error); }
+ """,
+ mandatory=False,
+ msg="Checking for ZIP_RDONLY",
+ uselib="ZIP",
+ define_name='DCPOMATIC_HAVE_ZIP_RDONLY'
+ )
# libbz2; must be explicitly linked on macOS for some reason
conf.check_cxx(fragment="""
conf.check_cfg(package='fontconfig', args='--cflags --libs', uselib_store='FONTCONFIG', mandatory=True)
# pangomm
- conf.check_cfg(package='pangomm-1.4', args='--cflags --libs', uselib_store='PANGOMM', mandatory=True)
+ conf.check_cfg(package='pangomm-' + conf.env.PANGOMM_API, args='--cflags --libs', uselib_store='PANGOMM', mandatory=True)
# cairomm
- conf.check_cfg(package='cairomm-1.0', args='--cflags --libs', uselib_store='CAIROMM', mandatory=True)
+ conf.check_cfg(package='cairomm-' + conf.env.CAIROMM_API, args='--cflags --libs', uselib_store='CAIROMM', mandatory=True)
# leqm_nrt
conf.check_cfg(package='leqm_nrt', args='--cflags --libs', uselib_store='LEQM_NRT', mandatory=True)
if conf.options.static_dcp:
conf.check_cfg(package='libdcp-1.0', args='libdcp-1.0 >= %s --cflags' % libdcp_version, uselib_store='DCP', mandatory=True)
conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
- conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-carl', 'kumu-carl', 'openjp2']
+ conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-dcpomatic', 'kumu-dcpomatic', 'openjp2']
conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt', 'xerces-c']
else:
conf.check_cfg(package='libdcp-1.0', args='libdcp-1.0 >= %s --cflags --libs' % libdcp_version, uselib_store='DCP', mandatory=True)
# libxml++
if conf.options.static_xmlpp:
- conf.env.STLIB_XMLPP = ['xml++-2.6']
+ conf.env.STLIB_XMLPP = ['xml++-' + conf.env.XMLPP_API]
conf.env.LIB_XMLPP = ['xml2']
else:
- conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XMLPP', mandatory=True)
+ conf.check_cfg(package='libxml++-' + conf.env.XMLPP_API, args='--cflags --libs', uselib_store='XMLPP', mandatory=True)
# libxmlsec
if conf.options.static_xmlsec: