X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=8ce5a9f60280802541b64c73481575156e8e9540;hb=fa05aff5e835cea046d832f0e0a09c490a2cf15d;hp=2f2d4122bb4219d05808f7ed54266d7241c24a13;hpb=906451444fb8888acb8553909e0667857c683c31;p=dcpomatic.git diff --git a/wscript b/wscript index 2f2d4122b..8ce5a9f60 100644 --- a/wscript +++ b/wscript @@ -26,7 +26,7 @@ import distutils.spawn from waflib import Logs, Context APPNAME = 'dcpomatic' -VERSION = '2.6.19' +VERSION = '2.6.26devel' 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