X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=b40c0315c825e744cde79d9c3b80fc85da673e60;hb=96f701cab4f397272b84200bc75bc6421d364e5b;hp=c11734e040a458dcab9f401b3e7902611b196cf0;hpb=3a50db958e8ac6a3c8d3ab66b20a7f681549f758;p=dcpomatic.git diff --git a/wscript b/wscript index c11734e04..b40c0315c 100644 --- a/wscript +++ b/wscript @@ -27,7 +27,7 @@ import distutils.spawn from waflib import Logs, Context APPNAME = 'dcpomatic' -VERSION = '2.11.11' +VERSION = '2.11.15devel' def options(opt): opt.load('compiler_cxx') @@ -111,9 +111,7 @@ def configure(conf): 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") @@ -121,7 +119,7 @@ def configure(conf): 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 \n int main() { std::locale::global (boost::locale::generator().generate ("")); }\n