opt.add_option('--disable-gui', action='store_true', default=False, help='disable building of GUI tools')
opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests')
opt.add_option('--install-prefix', default=None, help='prefix of where DCP-o-matic will be installed')
- opt.add_option('--target-windows', action='store_true', default=False, help='set up to do a cross-compile to make a Windows package')
+ opt.add_option('--target-windows', action='store_true', default=False, help='set up to do a cross-compile for Windows')
+ 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('--static-curl', action='store_true', default=False, help='link statically to libcurl')
opt.add_option('--workaround-gssapi', action='store_true', default=False, help='link to gssapi_krb5')
opt.add_option('--force-cpp11', action='store_true', default=False, help='force use of C++11')
- opt.add_option('--variant', help='build variant (swaroop-studio, swaroop-theater)', choices=['swaroop-studio', 'swaroop-theater'])
opt.add_option('--use-lld', action='store_true', default=False, help='use lld linker')
opt.add_option('--enable-disk', action='store_true', default=False, help='build dcpomatic2_disk tool; requires Boost process, lwext4 and nanomsg libraries')
+ 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')
def configure(conf):
conf.load('compiler_cxx')
conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS',
'-D__STDC_LIMIT_MACROS',
'-D__STDC_FORMAT_MACROS',
- '-msse',
'-fno-strict-aliasing',
'-Wall',
'-Wextra',
'-Wwrite-strings',
- # Remove auto_ptr warnings from libxml++-2.6
- '-Wno-deprecated-declarations',
+ # I tried and failed to ignore these with _Pragma
'-Wno-ignored-qualifiers',
- '-Wno-parentheses',
'-D_FILE_OFFSET_BITS=64'])
if conf.options.force_cpp11:
conf.env.append_value('CXXFLAGS', ['-std=c++11', '-DBOOST_NO_CXX11_SCOPED_ENUMS'])
+ 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['CXX_NAME'] == 'gcc':
gcc = conf.env['CC_VERSION']
- if int(gcc[0]) >= 4 and int(gcc[1]) > 1:
- conf.env.append_value('CXXFLAGS', ['-Wno-unused-result'])
- if int(gcc[0]) >= 9:
- conf.env.append_value('CXXFLAGS', ['-Wno-deprecated-copy'])
+ if int(gcc[0]) >= 8:
+ # I tried and failed to ignore these with _Pragma
+ conf.env.append_value('CXXFLAGS', ['-Wno-cast-function-type'])
have_c11 = int(gcc[0]) >= 4 and int(gcc[1]) >= 8 and int(gcc[2]) >= 1
+ # Most gccs still give these warnings from boost::optional
+ conf.env.append_value('CXXFLAGS', ['-Wno-maybe-uninitialized'])
else:
have_c11 = False
else:
conf.env.append_value('CXXFLAGS', '-O2')
- if conf.options.variant is not None:
- conf.env.VARIANT = conf.options.variant
- if conf.options.variant.startswith('swaroop-'):
- conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_VARIANT_SWAROOP')
-
if conf.options.enable_disk:
conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_DISK')
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/dcpomatic2"' % 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')
conf.env.append_value('CXXFLAGS', ['-Wlogical-op', '-Wcast-align'])
conf.check(lib='dl', uselib_store='DL', msg='Checking for library dl')
- if not conf.env.DISABLE_GUI:
- conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True)
# OSX
if conf.env.TARGET_OSX:
- conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_OSX', '-Wno-unused-function', '-Wno-unused-parameter', '-Wno-unused-local-typedef', '-Wno-potentially-evaluated-expression'])
+ conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_OSX', '-DGL_SILENCE_DEPRECATION'])
conf.env.append_value('LINKFLAGS', '-headerpad_max_install_names')
- else:
- # Avoid the endless warnings about _t uninitialized in optional<>
- conf.env.append_value('CXXFLAGS', '-Wno-maybe-uninitialized')
#
# Dependencies.
define_name='DCPOMATIC_HAVE_ZIP_SOURCE_T'
)
+ # libbz2; must be explicitly linked on macOS for some reason
+ conf.check_cxx(fragment="""
+ #include <bzlib.h>
+ int main() { BZ2_bzCompressInit(0, 0, 0, 0); }
+ """,
+ mandatory=True,
+ msg="Checking for libbz2",
+ okmsg='yes',
+ lib='bz2',
+ uselib_store="BZ2"
+ )
+
# fontconfig
conf.check_cfg(package='fontconfig', args='--cflags --libs', uselib_store='FONTCONFIG', mandatory=True)
# cairomm
conf.check_cfg(package='cairomm-1.0', 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)
+
test_cxxflags = ''
if have_c11:
test_cxxflags = '-std=c++11'
# libcxml
if conf.options.static_cxml:
- conf.check_cfg(package='libcxml', atleast_version='0.16.0', args='--cflags', uselib_store='CXML', mandatory=True)
+ conf.check_cfg(package='libcxml', atleast_version='0.17.0', args='--cflags', uselib_store='CXML', mandatory=True)
conf.env.STLIB_CXML = ['cxml']
else:
conf.check_cfg(package='libcxml', atleast_version='0.16.0', args='--cflags --libs', uselib_store='CXML', mandatory=True)
if conf.options.workaround_gssapi:
conf.env.LIB_SSH = ['gssapi_krb5']
else:
- conf.check_cc(fragment="""
+ conf.check_cxx(fragment="""
#include <libssh/libssh.h>\n
int main () {\n
- ssh_session s = ssh_new ();\n
+ ssh_new ();\n
return 0;\n
}
""",
if conf.options.enable_disk:
if conf.check_cfg(package='nanomsg', args='--cflags --libs', uselib_store='NANOMSG', mandatory=False) is None:
conf.check_cfg(package='libnanomsg', args='--cflags --libs', uselib_store='NANOMSG', mandatory=True)
+ if conf.env.TARGET_LINUX:
+ # We link with nanomsg statically on Centos 8 so we need to link this as well
+ conf.env.LIB_NANOMSG.append('anl')
# FFmpeg
if conf.options.static_ffmpeg:
conf.check_cxx(fragment="""
#include <boost/thread.hpp>\n
- int main() { boost::thread t (); }\n
+ int main() { boost::thread t; }\n
""",
msg='Checking for boost threading library',
libpath='/usr/local/lib',
deps.append('boost_filesystem%s' % boost_lib_suffix)
conf.check_cxx(fragment="""
#include <boost/process.hpp>\n
- int main() { boost::process::child* c = new boost::process::child("foo"); }\n
+ int main() { new boost::process::child("foo"); }\n
""",
+ cxxflags='-Wno-unused-parameter',
msg='Checking for boost process library',
lib=deps,
uselib_store='BOOST_PROCESS')
projects / dcpomatic.git / blobdiff