X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=wscript;h=867fb5f824266556833d1ac049613df465dca00e;hp=fbf115e1c70c1be9264ad4d8ddf1e72212b39f6e;hb=4f09ec8b35c5e4c32d17b340c6840699c85f280a;hpb=fba78f24a825995123c7fe06ba4cd92e7afe78ef diff --git a/wscript b/wscript index fbf115e1c..867fb5f82 100644 --- a/wscript +++ b/wscript @@ -58,7 +58,8 @@ def options(opt): 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') @@ -71,11 +72,10 @@ def options(opt): opt.add_option('--static-sub', action='store_true', default=False, help='link statically to libsub') 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') @@ -102,29 +102,29 @@ def configure(conf): 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', # I tried and failed to ignore these with _Pragma '-Wno-ignored-qualifiers', - # Most gccs still give these warnings from boost::optional - '-Wno-maybe-uninitialized', - '-D_FILE_OFFSET_BITS=64']) - - if conf.options.force_cpp11: - conf.env.append_value('CXXFLAGS', ['-std=c++11', '-DBOOST_NO_CXX11_SCOPED_ENUMS']) + '-D_FILE_OFFSET_BITS=64', + '-std=c++11']) 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]) >= 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 @@ -133,11 +133,6 @@ def configure(conf): 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') @@ -160,7 +155,6 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-DUNICODE') 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', '-std=c++11') conf.env.append_value('CXXFLAGS', '-Wcast-align') wxrc = os.popen('wx-config --rescomp').read().split()[1:] conf.env.append_value('WINRCFLAGS', wxrc) @@ -198,14 +192,14 @@ def configure(conf): 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') # OSX if conf.env.TARGET_OSX: - conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_OSX']) + conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_OSX', '-DGL_SILENCE_DEPRECATION']) conf.env.append_value('LINKFLAGS', '-headerpad_max_install_names') # @@ -259,6 +253,18 @@ def configure(conf): define_name='DCPOMATIC_HAVE_ZIP_SOURCE_T' ) + # libbz2; must be explicitly linked on macOS for some reason + conf.check_cxx(fragment=""" + #include + 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) @@ -271,10 +277,6 @@ def configure(conf): # 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' - # See if we have Cairo::ImageSurface::format_stride_for_width; Centos 5 does not conf.check_cxx(fragment=""" #include @@ -283,7 +285,6 @@ def configure(conf): return 0; }\n """, mandatory=False, - cxxflags=test_cxxflags, msg='Checking for format_stride_for_width', okmsg='yes', includes=conf.env['INCLUDES_CAIROMM'], @@ -301,7 +302,6 @@ def configure(conf): """, mandatory=False, msg='Checking for show_in_cairo_context', - cxxflags=test_cxxflags, okmsg='yes', includes=conf.env['INCLUDES_PANGOMM'], uselib='PANGOMM', @@ -310,7 +310,7 @@ def configure(conf): # 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) @@ -556,15 +556,6 @@ def configure(conf): lib=deps, uselib_store='BOOST_PROCESS') - # libxml++ requires glibmm and versions of glibmm 2.45.31 and later - # must be built with -std=c++11 as they use c++11 - # features and c++11 is not (yet) the default in gcc. - glibmm_version = conf.cmd_and_log(['pkg-config', '--modversion', 'glibmm-2.4'], output=Context.STDOUT, quiet=Context.BOTH) - s = glibmm_version.split('.') - v = (int(s[0]) << 16) | (int(s[1]) << 8) | int(s[2]) - if v >= 0x022D1F: - conf.env.append_value('CXXFLAGS', '-std=c++11') - # Other stuff conf.find_program('msgfmt', var='MSGFMT')