#
-# 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.10'
+VERSION = '2.11.38'
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:
conf.env.append_value('CXXFLAGS', ['-mconsole'])
conf.env.append_value('LINKFLAGS', ['-mconsole'])
conf.check(lib='ws2_32', uselib_store='WINSOCK2', msg="Checking for library winsock2")
- conf.check(lib='bfd', uselib_store='BFD', msg="Checking for library bfd")
conf.check(lib='dbghelp', uselib_store='DBGHELP', msg="Checking for library dbghelp")
- conf.check(lib='iberty', uselib_store='IBERTY', msg="Checking for library iberty")
conf.check(lib='shlwapi', uselib_store='SHLWAPI', msg="Checking for library shlwapi")
conf.check(lib='mswsock', uselib_store='MSWSOCK', msg="Checking for library mswsock")
conf.check(lib='ole32', uselib_store='OLE32', msg="Checking for library ole32")
conf.check(lib='winmm', uselib_store='WINMM', msg="Checking for library winmm")
conf.check(lib='ksuser', uselib_store='KSUSER', msg="Checking for library ksuser")
boost_lib_suffix = '-mt'
- boost_thread = 'boost_thread-mt'
+ boost_thread = 'boost_thread_win32-mt'
conf.check_cxx(fragment="""
#include <boost/locale.hpp>\n
int main() { std::locale::global (boost::locale::generator().generate ("")); }\n
# OSX
if conf.env.TARGET_OSX:
- conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_OSX', '-Wno-unused-function', '-Wno-unused-parameter', '-Wno-unused-local-typedef'])
+ 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('LINKFLAGS', '-headerpad_max_install_names')
#
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)