X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=03d2074283a357c38e5648cdb35e9d4dbb6f8bd4;hb=5215408c36898039e8fa294bb74bf94d5762b0c7;hp=3b260360bf88fe7f2e73398c9cf3d6b0b3dd7fd5;hpb=c222a8b30acc22cb1529e39e1c87759d528efeef;p=dcpomatic.git diff --git a/wscript b/wscript index 3b260360b..03d207428 100644 --- a/wscript +++ b/wscript @@ -35,8 +35,8 @@ except ImportError: from waflib import Logs, Context APPNAME = 'dcpomatic' -libdcp_version = '1.8.5' -libsub_version = '1.6.5' +libdcp_version = '1.8.13' +libsub_version = '1.6.13' this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0] last_version = subprocess.Popen(shlex.split('git describe --tags --match v* --abbrev=0'), stdout=subprocess.PIPE).communicate()[0] @@ -89,7 +89,7 @@ def configure(conf): conf.env.DISABLE_GUI = conf.options.disable_gui conf.env.DISABLE_TESTS = conf.options.disable_tests conf.env.TARGET_WINDOWS_64 = conf.options.target_windows_64 - conf.env.TARGET_WINDOWS_32 = conf.options.target_windows_64 + conf.env.TARGET_WINDOWS_32 = conf.options.target_windows_32 conf.env.TARGET_OSX = sys.platform == 'darwin' conf.env.TARGET_LINUX = not conf.env.TARGET_WINDOWS_64 and not conf.env.TARGET_WINDOWS_32 and not conf.env.TARGET_OSX conf.env.VERSION = VERSION @@ -173,6 +173,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") conf.check(lib='setupapi', uselib_store='SETUPAPI', msg="Checking for library setupapi") + conf.check(lib='uuid', uselib_store='UUID', msg="Checking for library uuid") boost_lib_suffix = '-mt-x32' if conf.options.target_windows_32 else '-mt-x64' boost_thread = 'boost_thread' + boost_lib_suffix conf.check_cxx(fragment="""