X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=290bf9b52496e033a232a45bb3fc5db19d5c140a;hb=042bbc2bbea3b898d94890ef3f39f74178e93462;hp=98a098f7e7ce67ad991f01695a81a6cd4374f932;hpb=43990add893eccf350f280e2dd3f947a94f3e9aa;p=dcpomatic.git diff --git a/wscript b/wscript index 98a098f7e..290bf9b52 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.56pre' +VERSION = '0.60pre' def options(opt): opt.load('compiler_cxx') @@ -11,8 +11,8 @@ def options(opt): 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('--disable-player', action='store_true', default = False, help = 'disable building of the player components') 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') def configure(conf): conf.load('compiler_cxx') @@ -21,12 +21,14 @@ def configure(conf): conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', '-Wall', '-Wno-attributes']) - # Turn off player for now - conf.options.disable_player = True - if conf.options.target_windows: - conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN']) - conf.options.disable_player = True + conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H']) + wxrc = os.popen('wx-config --rescomp').read().split()[1:] + print wxrc + conf.env.append_value('WINRCFLAGS', wxrc) + if conf.options.enable_debug: + 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") boost_lib_suffix = '-mt' boost_thread = 'boost_thread_win32-mt' @@ -34,41 +36,51 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-DDVDOMATIC_POSIX') boost_lib_suffix = '' boost_thread = 'boost_thread' + conf.env.append_value('LINKFLAGS', '-pthread') + # libxml2 seems to be linked against this on Ubuntu, but it doesn't mention it in its .pc file + conf.env.append_value('LIB', 'lzma') conf.env.TARGET_WINDOWS = conf.options.target_windows conf.env.DISABLE_GUI = conf.options.disable_gui - conf.env.DISABLE_PLAYER = conf.options.disable_player + conf.env.STATIC = conf.options.static conf.env.VERSION = VERSION - if conf.options.disable_player: - conf.env.append_value('CXXFLAGS', '-DDVDOMATIC_DISABLE_PLAYER') - if conf.options.enable_debug: conf.env.append_value('CXXFLAGS', ['-g', '-DDVDOMATIC_DEBUG']) else: - conf.env.append_value('CXXFLAGS', '-O3') - - conf.check_cfg(package = 'sigc++-2.0', args = '--cflags --libs', uselib_store = 'SIGC++', 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 = 'libpostproc', args = '--cflags --libs', uselib_store = 'POSTPROC', mandatory = True) + conf.env.append_value('CXXFLAGS', '-O2') + + # Arguments to pkg-config for things that we might want to link statically + pkgconfig_args = '--cflags --libs' + if conf.options.static: + pkgconfig_args += ' --static' + + conf.check_cfg(package = 'libdcp', atleast_version = '0.34', args = pkgconfig_args, uselib_store = 'DCP', mandatory = True) + conf.check_cfg(package = 'libavformat', args = pkgconfig_args, uselib_store = 'AVFORMAT', mandatory = True) + conf.check_cfg(package = 'libavfilter', args = pkgconfig_args, uselib_store = 'AVFILTER', mandatory = True) + conf.check_cfg(package = 'libavcodec', args = pkgconfig_args, uselib_store = 'AVCODEC', mandatory = True) + conf.check_cfg(package = 'libavutil', args = pkgconfig_args, uselib_store = 'AVUTIL', mandatory = True) + conf.check_cfg(package = 'libswscale', args = pkgconfig_args, uselib_store = 'SWSCALE', mandatory = True) + conf.check_cfg(package = 'libswresample', args = pkgconfig_args, uselib_store = 'SWRESAMPLE', mandatory = False) + conf.check_cfg(package = 'libpostproc', args = pkgconfig_args, uselib_store = 'POSTPROC', mandatory = True) conf.check_cfg(package = 'sndfile', args = '--cflags --libs', uselib_store = 'SNDFILE', mandatory = True) - conf.check_cfg(package = 'libdcp', atleast_version = '0.21', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True) + conf.check_cfg(package = 'libdcp', atleast_version = '0.33', args = pkgconfig_args, uselib_store = 'DCP', mandatory = True) conf.check_cfg(package = 'glib-2.0', args = '--cflags --libs', uselib_store = 'GLIB', mandatory = True) conf.check_cfg(package = '', path = 'Magick++-config', args = '--cppflags --cxxflags --libs', uselib_store = 'MAGICK', mandatory = True) - conf.check_cc(msg = 'Checking for library libtiff', function_name = 'TIFFOpen', header_name = 'tiffio.h', lib = 'tiff', uselib_store = 'TIFF') - conf.check_cc(fragment = """ - #include \n - #include \n - int main () {\n - void* p = (void *) opj_image_create;\n - return 0;\n - } - """, msg = 'Checking for library openjpeg', lib = 'openjpeg', uselib_store = 'OPENJPEG') + + openjpeg_fragment = """ + #include \n + #include \n + int main () {\n + void* p = (void *) opj_image_create;\n + return 0;\n + } + """ + + if conf.options.static: + conf.check_cc(fragment = openjpeg_fragment, msg = 'Checking for library openjpeg', stlib = 'openjpeg', uselib_store = 'OPENJPEG') + else: + conf.check_cc(fragment = openjpeg_fragment, msg = 'Checking for library openjpeg', lib = 'openjpeg', uselib_store = 'OPENJPEG') conf.check_cc(fragment = """ #include \n @@ -101,6 +113,13 @@ def configure(conf): lib = ['boost_date_time%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix], uselib_store = 'BOOST_DATETIME') + conf.check_cxx(fragment = """ + #include \n + int main() { boost::signals2::signal x; }\n + """, + msg = 'Checking for boost signals2 library', + uselib_store = 'BOOST_SIGNALS2') + conf.check_cc(fragment = """ #include int main() { g_format_size (1); }