projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Manual wording tweaks.
[dcpomatic.git]
/
wscript
diff --git
a/wscript
b/wscript
index 22227bcd6f63ea862823c845c63710cafb25d560..839cbbf351218b426f97835d035c910b9bd7a9ae 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.
34
devel'
+VERSION = '2.1.
46
devel'
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',
@@
-184,6
+183,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)
@@
-277,7
+279,7
@@
def configure(conf):
conf.env['LIB_%s' % name.upper()] = libs
conf.env['STLIB_%s' % name.upper()] = stlibs
conf.env['LIB_%s' % name.upper()] = libs
conf.env['STLIB_%s' % name.upper()] = stlibs
- conf.env['INCLUDE_%s' % name.upper()] = include
+ conf.env['INCLUDE
S
_%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)
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.recurse('platform/osx')
for r in ['22x22', '32x32', '48x48', '64x64', '128x128']:
- bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, '
icon
s/%s/dcpomatic2.png' % r)
+ bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, '
graphic
s/%s/dcpomatic2.png' % r)
if not bld.env.TARGET_WINDOWS:
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)
bld.install_files('${PREFIX}/share/dcpomatic2', 'LiberationSans-Regular.ttf')
bld.add_post_fun(post)