# 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:
# 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.70', 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)
def create_version_cc(version, cxx_flags):
commit = git_revision()
- print "1: ", commit
if commit is None and os.path.exists('.git_revision'):
f = open('.git_revision', 'r')
commit = f.readline().strip()
- print "2: ", commit
if commit is None:
commit = 'release'
- print commit
-
try:
text = '#include "version.h"\n'
text += 'char const * dcpomatic_git_commit = \"%s\";\n' % commit