Rename icons -> graphics.

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index ede6b74601f24cbfe47fb0876c808453ddcad145..a5742eb7b5170f32c6fa4bdb71777a7c42ede32e 100644 (file)
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs
 
 APPNAME = 'dcpomatic'
-VERSION = '2.1.14devel'
+VERSION = '2.1.37devel'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -217,12 +217,12 @@ def configure(conf):
 
     # libdcp
     if conf.options.static_dcp:
-        conf.check_cfg(package='libdcp-1.0', atleast_version='1.1.0', args='--cflags', uselib_store='DCP', mandatory=True)
+        conf.check_cfg(package='libdcp-1.0', atleast_version='1.2.0', args='--cflags', uselib_store='DCP', mandatory=True)
         conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
         conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-libdcp-1.0', 'kumu-libdcp-1.0']
         conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
     else:
-        conf.check_cfg(package='libdcp-1.0', atleast_version='1.1.0', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+        conf.check_cfg(package='libdcp-1.0', atleast_version='1.2.0', args='--cflags --libs', uselib_store='DCP', mandatory=True)
         conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
 
     # libsub
@@ -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_REGEX = ['boost_regex']
     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')
 
+        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')
@@ -401,10 +410,10 @@ def build(bld):
         bld.recurse('platform/osx')
 
     for r in ['22x22', '32x32', '48x48', '64x64', '128x128']:
-        bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dcpomatic2.png' % r)
+        bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'graphics/%s/dcpomatic2.png' % r)
 
     if not bld.env.TARGET_WINDOWS:
-        bld.install_files('${PREFIX}/share/dcpomatic2', 'icons/taskbar_icon.png')
+        bld.install_files('${PREFIX}/share/dcpomatic2', 'graphics/taskbar_icon.png')
         bld.install_files('${PREFIX}/share/dcpomatic2', 'LiberationSans-Regular.ttf')
 
     bld.add_post_fun(post)