X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=fb2a838dfe401021c8e7e8e5b119d0f5357de1ee;hb=260747962d87ed12115e940f7a9e86fcf7983ea4;hp=1a507fbc2a233a908827ed80fe08ad4c46167830;hpb=0a798ac7e9f46becd037f74cd3ec9ae40873bfc3;p=dcpomatic.git diff --git a/wscript b/wscript index 1a507fbc2..fb2a838df 100644 --- a/wscript +++ b/wscript @@ -3,18 +3,19 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.78beta5' +VERSION = '0.94pre' def options(opt): opt.load('compiler_cxx') opt.load('winres') - opt.add_option('--enable-debug', action='store_true', default = False, help = 'build with debugging information and without optimisation') - opt.add_option('--disable-gui', action='store_true', default = False, help = 'disable building of GUI tools') - opt.add_option('--target-windows', action='store_true', default = False, help = 'set up to do a cross-compile to Windows') - opt.add_option('--static', action='store_true', default = False, help = 'build statically, and link statically to libdcp and FFmpeg') - opt.add_option('--magickpp-config', action='store', default='Magick++-config', help = 'path to Magick++-config') - opt.add_option('--wx-config', action='store', default='wx-config', help = 'path to wx-config') + opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation') + opt.add_option('--disable-gui', action='store_true', default=False, help='disable building of GUI tools') + opt.add_option('--target-windows', action='store_true', default=False, help='set up to do a cross-compile to Windows') + opt.add_option('--static', action='store_true', default=False, help='build statically, and link statically to libdcp and FFmpeg') + opt.add_option('--magickpp-config', action='store', default='Magick++-config', help='path to Magick++-config') + opt.add_option('--wx-config', action='store', default='wx-config', help='path to wx-config') + opt.add_option('--osx', action='store_true', default=False, help='build on OS X') def configure(conf): conf.load('compiler_cxx') @@ -32,11 +33,15 @@ def configure(conf): conf.env.append_value('CXXFLAGS', ['-mconsole']) conf.env.append_value('LINKFLAGS', ['-mconsole']) conf.check(lib = 'ws2_32', uselib_store = 'WINSOCK2', msg = "Checking for library winsock2") + conf.check(lib = 'bfd', uselib_store = 'BFD', msg = "Checking for library bfd") + conf.check(lib = 'dbghelp', uselib_store = 'DBGHELP', msg = "Checking for library dbghelp") + conf.check(lib = 'iberty', uselib_store = 'IBERTY', msg = "Checking for library iberty") boost_lib_suffix = '-mt' boost_thread = 'boost_thread_win32-mt' else: conf.env.append_value('CXXFLAGS', '-DDVDOMATIC_POSIX') conf.env.append_value('CXXFLAGS', '-DPOSIX_LOCALE_PREFIX="%s/share/locale"' % conf.env['PREFIX']) + conf.env.append_value('CXXFLAGS', '-DPOSIX_ICON_PREFIX="%s/share/dvdomatic"' % conf.env['PREFIX']) boost_lib_suffix = '' boost_thread = 'boost_thread' conf.env.append_value('LINKFLAGS', '-pthread') @@ -47,6 +52,8 @@ def configure(conf): conf.env.DISABLE_GUI = conf.options.disable_gui conf.env.STATIC = conf.options.static conf.env.VERSION = VERSION + conf.env.TARGET_OSX = conf.options.osx + conf.env.TARGET_LINUX = not conf.options.target_windows and not conf.options.osx if conf.options.enable_debug: conf.env.append_value('CXXFLAGS', ['-g', '-DDVDOMATIC_DEBUG']) @@ -54,7 +61,7 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-O2') if not conf.options.static: - conf.check_cfg(package = 'libdcp', atleast_version = '0.41', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True) + conf.check_cfg(package = 'libdcp', atleast_version = '0.49', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True) conf.check_cfg(package = 'libavformat', args = '--cflags --libs', uselib_store = 'AVFORMAT', mandatory = True) conf.check_cfg(package = 'libavfilter', args = '--cflags --libs', uselib_store = 'AVFILTER', mandatory = True) conf.check_cfg(package = 'libavcodec', args = '--cflags --libs', uselib_store = 'AVCODEC', mandatory = True) @@ -170,36 +177,6 @@ def configure(conf): define_name = 'HAVE_G_FORMAT_SIZE', mandatory = False) - conf.check_cc(fragment = """ - extern "C" { - #include - } - int main() { AVPixelFormat f; } - """, msg = 'Checking for AVPixelFormat', - uselib = 'AVUTIL', - define_name = 'HAVE_AV_PIXEL_FORMAT', - mandatory = False) - - conf.check_cc(fragment = """ - extern "C" { - #include - } - int main() { AVFrame* f; av_frame_get_best_effort_timestamp(f); } - """, msg = 'Checking for av_frame_get_best_effort_timestamp', - uselib = 'AVCODEC', - define_name = 'HAVE_AV_FRAME_GET_BEST_EFFORT_TIMESTAMP', - mandatory = False) - - conf.check_cc(fragment = """ - extern "C" { - #include - } - int main() { } - """, msg = 'Checking for buffersrc.h', - uselib = 'AVCODEC', - define_name = 'HAVE_BUFFERSRC_H', - mandatory = False) - conf.find_program('msgfmt', var='MSGFMT') datadir = conf.env.DATADIR @@ -218,19 +195,16 @@ def build(bld): bld.recurse('src') bld.recurse('test') if bld.env.TARGET_WINDOWS: - bld.recurse('windows') + bld.recurse('platform/windows') + if bld.env.TARGET_LINUX: + bld.recurse('platform/linux') - d = { 'PREFIX' : '${PREFIX' } - - obj = bld(features = 'subst') - obj.source = 'dvdomatic.desktop.in' - obj.target = 'dvdomatic.desktop' - obj.dict = d - - bld.install_files('${PREFIX}/share/applications', 'dvdomatic.desktop') for r in ['22x22', '32x32', '48x48', '64x64', '128x128']: bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dvdomatic.png' % r) + if not bld.env.TARGET_WINDOWS: + bld.install_files('${PREFIX}/share/dvdomatic', 'icons/taskbar_icon.png') + bld.add_post_fun(post) def dist(ctx):