X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=18409fe01eab5c1019524858aa36b989c3788c2b;hb=6726436b0e9f4f747d76a1de023af0259c1f4946;hp=9a6da65a132e2d621538aedaea40af16bf8093e0;hpb=b75b2a81c24716e21442178b77ee0276ddff843c;p=dcpomatic.git diff --git a/wscript b/wscript index 9a6da65a1..18409fe01 100644 --- a/wscript +++ b/wscript @@ -26,7 +26,7 @@ import distutils.spawn from waflib import Logs APPNAME = 'dcpomatic' -VERSION = '2.1.37devel' +VERSION = '2.1.52devel' 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', @@ -164,6 +163,9 @@ def configure(conf): # libsndfile conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=True) + # libsamplerate + conf.check_cfg(package='samplerate', args='--cflags --libs', uselib_store='SAMPLERATE', mandatory=True) + # glib conf.check_cfg(package='glib-2.0', args='--cflags --libs', uselib_store='GLIB', mandatory=True) @@ -184,6 +186,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) @@ -237,6 +242,7 @@ def configure(conf): # libxml++ if conf.options.static_xmlpp: conf.env.STLIB_XMLPP = ['xml++-2.6'] + conf.env.LIB_XMLPP = ['xml2'] else: conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XMLPP', mandatory=True)