projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use libsamplerate for resampling instead of FFmpeg / libsoxr.
[dcpomatic.git]
/
wscript
diff --git
a/wscript
b/wscript
index 7195ee6278c5ae645ece4feb90b85ea769839d96..18409fe01eab5c1019524858aa36b989c3788c2b 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-26,7
+26,7
@@
import distutils.spawn
from waflib import Logs
APPNAME = 'dcpomatic'
from waflib import Logs
APPNAME = 'dcpomatic'
-VERSION = '2.1.5
0
devel'
+VERSION = '2.1.5
2
devel'
def options(opt):
opt.load('compiler_cxx')
def options(opt):
opt.load('compiler_cxx')
@@
-163,6
+163,9
@@
def configure(conf):
# libsndfile
conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=True)
# 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)
# glib
conf.check_cfg(package='glib-2.0', args='--cflags --libs', uselib_store='GLIB', mandatory=True)
@@
-239,6
+242,7
@@
def configure(conf):
# libxml++
if conf.options.static_xmlpp:
conf.env.STLIB_XMLPP = ['xml++-2.6']
# 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)
else:
conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XMLPP', mandatory=True)