X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=b5ff29b9897479eb7cad4cb80c4e7a166dfe0f4e;hb=b679478a2885b03f6b4b415d3f9159965a67e19e;hp=b61c0a085efbef40b1105ae332acb23db1baf3e9;hpb=c674598c4366d475b6356e2f56c112a36b0c472e;p=dcpomatic.git

diff --git a/wscript b/wscript
index b61c0a085..b5ff29b98 100644
--- a/wscript
+++ b/wscript
@@ -23,10 +23,10 @@ import sys
 import glob
 import distutils
 import distutils.spawn
-from waflib import Logs
+from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.3.14'
+VERSION = '2.4.15devel'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -372,6 +372,15 @@ def configure(conf):
                        lib=['boost_regex%s' % boost_lib_suffix],
                        uselib_store='BOOST_REGEX')
 
+    # libxml++ requires glibmm and versions of glibmm 2.45.31 and later
+    # must be built with -std=c++11 as they use c++11
+    # features and c++11 is not (yet) the default in gcc.
+    glibmm_version = conf.cmd_and_log(['pkg-config', '--modversion', 'glibmm-2.4'], output=Context.STDOUT, quiet=Context.BOTH)
+    s = glibmm_version.split('.')
+    v = (int(s[0]) << 16) | (int(s[1]) << 8) | int(s[2])
+    if v >= 0x022D1F:
+        conf.env.append_value('CXXFLAGS', '-std=c++11')
+
     # Other stuff
 
     conf.find_program('msgfmt', var='MSGFMT')
@@ -421,6 +430,8 @@ def build(bld):
     create_version_cc(VERSION, bld.env.CXXFLAGS)
 
     bld.recurse('src')
+    bld.recurse('graphics')
+
     if not bld.env.DISABLE_TESTS:
         bld.recurse('test')
     if bld.env.TARGET_WINDOWS:
@@ -430,13 +441,10 @@ def build(bld):
     if bld.env.TARGET_OSX:
         bld.recurse('platform/osx')
 
-    for r in ['22x22', '32x32', '48x48', '64x64', '128x128']:
-        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', 'graphics/taskbar_icon.png')
-        bld.install_files('${PREFIX}/share/dcpomatic2', 'graphics/splash.png')
-        bld.install_files('${PREFIX}/share/dcpomatic2', 'LiberationSans-Regular.ttf')
+        bld.install_files('${PREFIX}/share/dcpomatic2', 'fonts/LiberationSans-Regular.ttf')
+        bld.install_files('${PREFIX}/share/dcpomatic2', 'fonts/LiberationSans-Italic.ttf')
+        bld.install_files('${PREFIX}/share/dcpomatic2', 'fonts/LiberationSans-Bold.ttf')
 
     bld.add_post_fun(post)
 
@@ -501,15 +509,7 @@ def pot_merge(bld):
     bld.recurse('src')
 
 def tags(bld):
-    os.system('etags src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc src/tools/*.h')
-
-def zanata_pull(bld):
-    os.system('zanata-cli -B -q pull -t .')
-    for f in glob.glob('src/lib/po/*.po'):
-        l = os.path.basename(f)
-        os.rename('dcpomatic_%s' % l, 'src/tools/po/%s' % l)
-        os.rename('libdcpomatic_%s' % l, 'src/lib/po/%s' % l)
-        os.rename('libdcpomatic-wx_%s' % l, 'src/wx/po/%s' % l)
+    os.system('etags src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc')
 
 def cppcheck(bld):
     os.system('cppcheck --enable=all --quiet .')