X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=d3ba407114e3d2b0ad6d223d6237fb0c60ad8ed2;hb=c14142497db2c12db7305f19d5de59a6061055e0;hp=e9d70575f92d24720802b0e11d3611088b91228a;hpb=5ab25b6657e7ff9e57ff66e55cb884ca9bb3d653;p=dcpomatic.git diff --git a/wscript b/wscript index e9d70575f..d3ba40711 100644 --- a/wscript +++ b/wscript @@ -26,7 +26,7 @@ import distutils.spawn from waflib import Logs, Context APPNAME = 'dcpomatic' -VERSION = '2.6.18devel' +VERSION = '2.6.27' def options(opt): opt.load('compiler_cxx') @@ -111,7 +111,7 @@ def configure(conf): conf.check(lib='shlwapi', uselib_store='SHLWAPI', msg="Checking for library shlwapi") conf.check(lib='mswsock', uselib_store='MSWSOCK', msg="Checking for library mswsock") boost_lib_suffix = '-mt' - boost_thread = 'boost_thread_win32-mt' + boost_thread = 'boost_thread-mt' conf.check_cxx(fragment=""" #include \n int main() { std::locale::global (boost::locale::generator().generate ("")); }\n @@ -310,7 +310,7 @@ def configure(conf): libpath='/usr/local/lib', lib=['avfilter'], uselib_store='PATCHED_FFMPEG', - defines_name='DCPOMATIC_HAVE_PATCHED_FFMPEG', + define_name='DCPOMATIC_HAVE_PATCHED_FFMPEG', mandatory=False) # Boost