X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=fc5c80e29d51dcd80d445ba027c232dbace9da1e;hb=81b73dcfaa36dcf82666e1b059e275a3579c1d62;hp=8e36f8aa6deec8edaa1f20d03f20c39b66e8f60a;hpb=d382f34db155ddaf4bb61538c18b87c7564e00b2;p=dcpomatic.git diff --git a/wscript b/wscript index 8e36f8aa6..fc5c80e29 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.56pre' +VERSION = '0.58pre' def options(opt): opt.load('compiler_cxx') @@ -25,7 +25,10 @@ def configure(conf): conf.options.disable_player = True if conf.options.target_windows: - conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN']) + conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H']) + if conf.options.enable_debug: + conf.env.append_value('CXXFLAGS', ['-mconsole']) + conf.env.append_value('LINKFLAGS', ['-mconsole']) conf.options.disable_player = True conf.check(lib = 'ws2_32', uselib_store = 'WINSOCK2', msg = "Checking for library winsock2") boost_lib_suffix = '-mt' @@ -34,6 +37,7 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-DDVDOMATIC_POSIX') boost_lib_suffix = '' boost_thread = 'boost_thread' + conf.env.append_value('LINKFLAGS', '-pthread') conf.env.TARGET_WINDOWS = conf.options.target_windows conf.env.DISABLE_GUI = conf.options.disable_gui @@ -48,7 +52,6 @@ def configure(conf): else: conf.env.append_value('CXXFLAGS', '-O3') - conf.check_cfg(package = 'sigc++-2.0', args = '--cflags --libs', uselib_store = 'SIGC++', mandatory = True) conf.check_cfg(package = 'libavformat', args = '--cflags --libs', uselib_store = 'AVFORMAT', mandatory = True) conf.check_cfg(package = 'libavfilter', args = '--cflags --libs', uselib_store = 'AVFILTER', mandatory = True) conf.check_cfg(package = 'libavcodec', args = '--cflags --libs', uselib_store = 'AVCODEC', mandatory = True) @@ -57,7 +60,7 @@ def configure(conf): conf.check_cfg(package = 'libswresample', args = '--cflags --libs', uselib_store = 'SWRESAMPLE', mandatory = False) conf.check_cfg(package = 'libpostproc', args = '--cflags --libs', uselib_store = 'POSTPROC', mandatory = True) conf.check_cfg(package = 'sndfile', args = '--cflags --libs', uselib_store = 'SNDFILE', mandatory = True) - conf.check_cfg(package = 'libdcp', atleast_version = '0.21', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True) + conf.check_cfg(package = 'libdcp', atleast_version = '0.30', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True) conf.check_cfg(package = 'glib-2.0', args = '--cflags --libs', uselib_store = 'GLIB', mandatory = True) conf.check_cfg(package = '', path = 'Magick++-config', args = '--cppflags --cxxflags --libs', uselib_store = 'MAGICK', mandatory = True) conf.check_cc(msg = 'Checking for library libtiff', function_name = 'TIFFOpen', header_name = 'tiffio.h', lib = 'tiff', uselib_store = 'TIFF') @@ -93,6 +96,21 @@ def configure(conf): lib = ['boost_filesystem%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix], uselib_store = 'BOOST_FILESYSTEM') + conf.check_cxx(fragment = """ + #include \n + int main() { boost::gregorian::day_clock::local_day(); }\n + """, msg = 'Checking for boost datetime library', + libpath = '/usr/local/lib', + lib = ['boost_date_time%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix], + uselib_store = 'BOOST_DATETIME') + + conf.check_cxx(fragment = """ + #include \n + int main() { boost::signals2::signal x; }\n + """, + msg = 'Checking for boost signals2 library', + uselib_store = 'BOOST_SIGNALS2') + conf.check_cc(fragment = """ #include int main() { g_format_size (1); }