X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=481c9e8cf2e6f6cbf812c33107fa547a1804e611;hb=f0380b3df50ca48ad2f22b5e7d5544dc9fa30d61;hp=4b4c1342ddf758efb72856fe27ed32af28dfed48;hpb=8cf1e8377506936224e8b26121680563d47682fe;p=dcpomatic.git diff --git a/wscript b/wscript index 4b4c1342d..481c9e8cf 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.00pre' +VERSION = '1.04pre' def options(opt): opt.load('compiler_cxx') @@ -45,7 +45,7 @@ def configure(conf): # Windows-specific if conf.env.TARGET_WINDOWS: - conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H', '-DUNICODE']) + conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H', '-DUNICODE', '-DBOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN']) wxrc = os.popen('wx-config --rescomp').read().split()[1:] conf.env.append_value('WINRCFLAGS', wxrc) if conf.options.enable_debug: @@ -86,7 +86,7 @@ def configure(conf): # Dependencies which are dynamically linked everywhere except --static # Get libs only when we are dynamically linking - conf.check_cfg(package='libdcp', atleast_version='0.67', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp', atleast_version='0.78', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) # Remove erroneous escaping of quotes from xmlsec1 defines conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] conf.check_cfg(package='libcxml', atleast_version='0.01', args=pkg_config_args(conf), uselib_store='CXML', mandatory=True)