#
-# Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+# Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
#
# This file is part of DCP-o-matic.
#
from waflib import Logs, Context
APPNAME = 'dcpomatic'
-VERSION = '2.11.22devel'
+VERSION = '2.11.72'
def options(opt):
opt.load('compiler_cxx')
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')
def configure(conf):
conf.load('compiler_cxx')
'-Wno-deprecated-declarations',
'-D_FILE_OFFSET_BITS=64'])
+ if conf.options.force_cpp11:
+ conf.env.append_value('CXXFLAGS', ['-std=c++11', '-DBOOST_NO_CXX11_SCOPED_ENUMS'])
+
gcc = conf.env['CC_VERSION']
if int(gcc[0]) >= 4 and int(gcc[1]) > 1:
conf.env.append_value('CXXFLAGS', ['-Wno-unused-result'])
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')
wxrc = os.popen('wx-config --rescomp').read().split()[1:]
conf.env.append_value('WINRCFLAGS', wxrc)
if conf.options.enable_debug:
includes=conf.env['INCLUDES_MAGICK'],
define_name='DCPOMATIC_HAVE_MAGICKLIB_NAMESPACE')
+ # See where MagickCore.h is
+ conf.check_cxx(fragment="""
+ #include <magick/MagickCore.h>\n
+ int main() { return 0; }\n
+ """,
+ mandatory=False,
+ msg='Checking for MagickCore.h location',
+ okmsg='magick',
+ errmsg='not magick',
+ includes=conf.env['INCLUDES_MAGICK'],
+ define_name='DCPOMATIC_MAGICKCORE_MAGICK')
+
+ conf.check_cxx(fragment="""
+ #include <MagickCore/MagickCore.h>\n
+ int main() { return 0; }\n
+ """,
+ mandatory=False,
+ msg='Checking for MagickCore.h location',
+ okmsg='MagickCore',
+ errmsg='not MagickCore',
+ includes=conf.env['INCLUDES_MAGICK'],
+ define_name='DCPOMATIC_MAGICKCORE_MAGICKCORE')
+
+ # See if we have advanced compare() methods in Magick
+ conf.check_cxx(fragment="""
+ #include <Magick++.h>\n
+ int main() { Magick::Image a; Magick::Image b; a.compare(b, Magick::RootMeanSquaredErrorMetric); }
+ """,
+ mandatory=False,
+ msg='Checking for advanced compare() method in {Image/Graphics}Magick',
+ uselib='MAGICK',
+ define_name='DCPOMATIC_ADVANCED_MAGICK_COMPARE'
+ )
+
# libzip
conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True)
+ conf.check_cxx(fragment="""
+ #include <zip.h>
+ int main() { zip_source_t* foo; }
+ """,
+ mandatory=False,
+ msg="Checking for zip_source_t",
+ uselib="ZIP",
+ define_name='DCPOMATIC_HAVE_ZIP_SOURCE_T'
+ )
# fontconfig
conf.check_cfg(package='fontconfig', args='--cflags --libs', uselib_store='FONTCONFIG', mandatory=True)
# libcxml
if conf.options.static_cxml:
- conf.check_cfg(package='libcxml', atleast_version='0.15.1', args='--cflags', uselib_store='CXML', mandatory=True)
+ conf.check_cfg(package='libcxml', atleast_version='0.15.5', args='--cflags', uselib_store='CXML', mandatory=True)
conf.env.STLIB_CXML = ['cxml']
else:
- conf.check_cfg(package='libcxml', atleast_version='0.15.1', args='--cflags --libs', uselib_store='CXML', mandatory=True)
+ conf.check_cfg(package='libcxml', atleast_version='0.15.5', args='--cflags --libs', uselib_store='CXML', mandatory=True)
# libssh
if conf.options.static_ssh:
# libdcp
if conf.options.static_dcp:
- conf.check_cfg(package='libdcp-1.0', atleast_version='1.4.1', args='--cflags', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.5.1', args='--cflags', 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-cth', 'kumu-cth', 'openjp2']
conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
else:
- conf.check_cfg(package='libdcp-1.0', atleast_version='1.4.1', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.5.1', args='--cflags --libs', uselib_store='DCP', mandatory=True)
conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
# libsub
if conf.options.static_sub:
- conf.check_cfg(package='libsub-1.0', atleast_version='1.2.1', args='--cflags', uselib_store='SUB', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.3.0', args='--cflags', uselib_store='SUB', mandatory=True)
conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
conf.env.STLIB_SUB = ['sub-1.0']
else:
- conf.check_cfg(package='libsub-1.0', atleast_version='1.2.1', args='--cflags --libs', uselib_store='SUB', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.3.0', args='--cflags --libs', uselib_store='SUB', mandatory=True)
conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
# libxml++
Logs.pprint('YELLOW', '')
+def download_supporters():
+ os.system('curl https://dcpomatic.com/supporters.cc > build/supporters.cc')
+
def build(bld):
create_version_cc(VERSION, bld.env.CXXFLAGS)
+ download_supporters()
bld.recurse('src')
bld.recurse('graphics')