X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=21599e171fe689b1d1d71d040f360f6ca124edfc;hb=883d885dc8690519d205c8baa275385af8a39f4b;hp=ebdfa2290f0a26bc04ba09c267b5e78404e2dcc0;hpb=f861018389acd9d277fe34d7621182b9b54f977f;p=dcpomatic.git diff --git a/wscript b/wscript index ebdfa2290..21599e171 100644 --- a/wscript +++ b/wscript @@ -9,19 +9,20 @@ 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') if conf.options.target_windows: conf.load('winres') - conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', + conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-D__STDC_LIMIT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', '-Wall', '-Wno-attributes', '-Wextra']) if conf.options.target_windows: @@ -32,6 +33,9 @@ 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: @@ -48,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', '-DDCPOMATIC_DEBUG']) @@ -55,14 +61,14 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-O2') if not conf.options.static: - conf.check_cfg(package = 'libdcp', atleast_version = '0.45', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True) + conf.check_cfg(package = 'libdcp', atleast_version = '0.52', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True) conf.check_cfg(package = 'libcxml', atleast_version = '0.01', args = '--cflags --libs', uselib_store = 'CXML', 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) conf.check_cfg(package = 'libavutil', args = '--cflags --libs', uselib_store = 'AVUTIL', mandatory = True) conf.check_cfg(package = 'libswscale', args = '--cflags --libs', uselib_store = 'SWSCALE', mandatory = True) - conf.check_cfg(package = 'libswresample', args = '--cflags --libs', uselib_store = 'SWRESAMPLE', mandatory = False) + conf.check_cfg(package = 'libswresample', args = '--cflags --libs', uselib_store = 'SWRESAMPLE', mandatory = True) conf.check_cfg(package = 'libpostproc', args = '--cflags --libs', uselib_store = 'POSTPROC', mandatory = True) else: # This is hackio grotesquio for static builds (ie for .deb packages). We need to link some things @@ -87,14 +93,10 @@ def configure(conf): conf.env.STLIB_AVUTIL = ['avutil'] conf.env.HAVE_SWSCALE = 1 conf.env.STLIB_SWSCALE = ['swscale'] - conf.env.HAVE_SWRESAMPLE = 1 - conf.env.STLIB_SWRESAMPLE = ['swresample'] conf.env.HAVE_POSTPROC = 1 conf.env.STLIB_POSTPROC = ['postproc'] - - # This doesn't seem to be set up, and we need it otherwise resampling support - # won't be included. Hack upon a hack, obviously - conf.env.append_value('CXXFLAGS', ['-DHAVE_SWRESAMPLE=1']) + conf.env.HAVE_SWRESAMPLE = 1 + conv.env.STLIB_SWRESAMPLE = ['swresample'] conf.check_cfg(package = 'sndfile', args = '--cflags --libs', uselib_store = 'SNDFILE', mandatory = True) conf.check_cfg(package = 'glib-2.0', args = '--cflags --libs', uselib_store = 'GLIB', mandatory = True) @@ -175,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 @@ -223,16 +195,12 @@ def build(bld): bld.recurse('src') bld.recurse('test') if bld.env.TARGET_WINDOWS: - bld.recurse('windows') - - d = { 'PREFIX' : '${PREFIX' } - - obj = bld(features = 'subst') - obj.source = 'dcpomatic.desktop.in' - obj.target = 'dcpomatic.desktop' - obj.dict = d + bld.recurse('platform/windows') + if bld.env.TARGET_LINUX: + bld.recurse('platform/linux') + if bld.env.TARGET_OSX: + bld.recurse('platform/osx') - bld.install_files('${PREFIX}/share/applications', 'dcpomatic.desktop') for r in ['22x22', '32x32', '48x48', '64x64', '128x128']: bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dcpomatic.png' % r)