Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index 63c6794afc58f23626f829e2d4bab1296b816ab0..d17226441551c59dca89e340eb2c9133be1d3592 100644 (file)
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs
 
 APPNAME = 'dcpomatic'
-VERSION = '2.1.40'
+VERSION = '2.1.49devel'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -75,7 +75,6 @@ def configure(conf):
                                        '-D__STDC_LIMIT_MACROS',
                                        '-D__STDC_FORMAT_MACROS',
                                        '-msse',
-                                       '-ffast-math',
                                        '-fno-strict-aliasing',
                                        '-Wall',
                                        '-Wno-attributes',
@@ -184,6 +183,9 @@ def configure(conf):
     # libzip
     conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True)
 
+    # fontconfig
+    conf.check_cfg(package='fontconfig', args='--cflags --libs', uselib_store='FONTCONFIG', mandatory=True)
+
     # pangomm
     conf.check_cfg(package='pangomm-1.4', args='--cflags --libs', uselib_store='PANGOMM', mandatory=True)