projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix test for time rounding change.
[dcpomatic.git]
/
wscript
diff --git
a/wscript
b/wscript
index 7671975f4a4f4b009430bc32bd730572b63254b3..e7ed503611e3bfd3123d4bc25d688a87bf12fe47 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.
14
'
+VERSION = '2.1.
21devel
'
def options(opt):
opt.load('compiler_cxx')
def options(opt):
opt.load('compiler_cxx')
@@
-227,11
+227,11
@@
def configure(conf):
# libsub
if conf.options.static_sub:
# libsub
if conf.options.static_sub:
- conf.check_cfg(package='libsub-1.0', atleast_version='1.1.0', args='--cflags', uselib_store='
DCP
', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.1.0', args='--cflags', uselib_store='
SUB
', mandatory=True)
conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
conf.env.STLIB_SUB = ['sub-1.0']
else:
conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
conf.env.STLIB_SUB = ['sub-1.0']
else:
- conf.check_cfg(package='libsub-1.0', atleast_version='1.1.0', args='--cflags --libs', uselib_store='
DCP
', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.1.0', args='--cflags --libs', uselib_store='
SUB
', mandatory=True)
conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
# libxml++
conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
# libxml++
@@
-295,6
+295,7
@@
def configure(conf):
conf.env.STLIB_BOOST_DATETIME = ['boost_date_time%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix]
conf.env.STLIB_BOOST_SIGNALS2 = ['boost_signals2']
conf.env.STLIB_BOOST_SYSTEM = ['boost_system']
conf.env.STLIB_BOOST_DATETIME = ['boost_date_time%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix]
conf.env.STLIB_BOOST_SIGNALS2 = ['boost_signals2']
conf.env.STLIB_BOOST_SYSTEM = ['boost_system']
+ conf.env.STLIB_BOOST_REGEX = ['boost_regex']
else:
conf.check_cxx(fragment="""
#include <boost/version.hpp>\n
else:
conf.check_cxx(fragment="""
#include <boost/version.hpp>\n
@@
-342,6
+343,14
@@
def configure(conf):
msg='Checking for boost signals2 library',
uselib_store='BOOST_SIGNALS2')
msg='Checking for boost signals2 library',
uselib_store='BOOST_SIGNALS2')
+ conf.check_cxx(fragment="""
+ #include <boost/regex.hpp>\n
+ int main() { boost::regex re ("foo"); }\n
+ """,
+ msg='Checking for boost regex library',
+ lib=['boost_regex%s' % boost_lib_suffix],
+ uselib_store='BOOST_REGEX')
+
# Other stuff
conf.find_program('msgfmt', var='MSGFMT')
# Other stuff
conf.find_program('msgfmt', var='MSGFMT')