Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

diff --combined wscript
index dce57b29b1b64c271970c56ce7051771da29012f,2583d400af6e5f13e31cd4eec0a658d7b0db3860..6ea7dedcb337434c7ef3bcc4873ef92a859dd868
--- 1/wscript
--- 2/wscript
+++ b/wscript
@@@ -36,12 -36,12 +36,12 @@@ if this_version == ''
  else:
      VERSION = this_version[1:].strip()
  
 -print 'Version: %s' % VERSION
 +print('Version: %s' % VERSION)
  
  def options(opt):
      opt.load('compiler_cxx')
      opt.load('winres')
- 
+     
      opt.add_option('--enable-debug',      action='store_true', default=False, help='build with debugging information and without optimisation')
      opt.add_option('--disable-gui',       action='store_true', default=False, help='disable building of GUI tools')
      opt.add_option('--disable-tests',     action='store_true', default=False, help='disable building of tests')
@@@ -63,6 -63,7 +63,7 @@@
  
  def configure(conf):
      conf.load('compiler_cxx')
+     conf.load('clang_compilation_database', tooldir=['waf-tools'])
      if conf.options.target_windows:
          conf.load('winres')