X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=4b353b8488d20380a09d4cf5d39c97a40964d3be;hb=a7a50d633ab376bc808cf9f0468c795984f2713b;hp=395e861ba5fec027b22d74def2cc007ef3e911e4;hpb=06cb221084eeeb9743a1ba32dea7c760537a368d;p=dcpomatic.git

diff --git a/wscript b/wscript
index 395e861ba..4b353b848 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs
 
 APPNAME = 'dcpomatic'
-VERSION = '2.1.33'
+VERSION = '2.1.48devel'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -75,7 +75,6 @@ def configure(conf):
                                        '-D__STDC_LIMIT_MACROS',
                                        '-D__STDC_FORMAT_MACROS',
                                        '-msse',
-                                       '-ffast-math',
                                        '-fno-strict-aliasing',
                                        '-Wall',
                                        '-Wno-attributes',
@@ -184,6 +183,9 @@ def configure(conf):
     # 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)
 
@@ -277,7 +279,7 @@ def configure(conf):
 
             conf.env['LIB_%s' % name.upper()] = libs
             conf.env['STLIB_%s' % name.upper()] = stlibs
-            conf.env['INCLUDE_%s' % name.upper()] = include
+            conf.env['INCLUDES_%s' % name.upper()] = include
             conf.env['LIBPATH_%s' % name.upper()] = libpath
     else:
         conf.check_cfg(package='libavformat', args='--cflags --libs', uselib_store='AVFORMAT', mandatory=True)
@@ -410,10 +412,11 @@ 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', 'graphics/splash.png')
         bld.install_files('${PREFIX}/share/dcpomatic2', 'LiberationSans-Regular.ttf')
 
     bld.add_post_fun(post)