projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump version
[dcpomatic.git]
/
wscript
diff --git
a/wscript
b/wscript
index 39b4f0d38105c7bb5b82b915a7937d8d66c00c30..982aa490818b7c7646e3c33efd29e0dd2194e907 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.
43devel
'
+VERSION = '2.1.
54
'
def options(opt):
opt.load('compiler_cxx')
def options(opt):
opt.load('compiler_cxx')
@@
-75,7
+75,6
@@
def configure(conf):
'-D__STDC_LIMIT_MACROS',
'-D__STDC_FORMAT_MACROS',
'-msse',
'-D__STDC_LIMIT_MACROS',
'-D__STDC_FORMAT_MACROS',
'-msse',
- '-ffast-math',
'-fno-strict-aliasing',
'-Wall',
'-Wno-attributes',
'-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)
# 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)
@@
-184,6
+186,9
@@
def configure(conf):
# libzip
conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True)
# 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)
# 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']
# 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)