X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=b5263ea42c3ac78863511969c73344473792d80b;hb=9a34c90600fcce228322d5b52581fb6c0dd10a5b;hp=d6cfd45c6db74971a8b10ddadf87db3cf44470d6;hpb=50b2a3b1e633ea465802601b8ac992a6159f77cf;p=dcpomatic.git diff --git a/wscript b/wscript index d6cfd45c6..b5263ea42 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.58pre' +VERSION = '0.62pre' 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,15 +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', '-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.options.disable_player = True conf.check(lib = 'ws2_32', uselib_store = 'WINSOCK2', msg = "Checking for library winsock2") boost_lib_suffix = '-mt' boost_thread = 'boost_thread_win32-mt' @@ -38,40 +37,70 @@ def configure(conf): 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 = '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') + + if not conf.options.static: + conf.check_cfg(package = 'libdcp', atleast_version = '0.34', 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) + 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) + else: + # This is hackio grotesquio for static builds (ie for .deb packages). We need to link some things + # statically and some dynamically, or things get horribly confused the dynamic linker (I think) + # crashes horribly. These calls do what the check_cfg calls would have done, but specify the + # different bits as static or dynamic as required. It'll break if you look at it funny, but + # I think anyone else who builds would do so dynamically. + conf.env.HAVE_DCP = 1 + conf.env.STLIB_DCP = ['dcp', 'asdcp-libdcp', 'kumu-libdcp'] + conf.env.LIB_DCP = ['glibmm-2.4', 'xml++-2.6', 'ssl', 'crypto', 'bz2'] + conf.env.HAVE_AVFORMAT = 1 + conf.env.STLIB_AVFORMAT = ['avformat'] + conf.env.HAVE_AVFILTER = 1 + conf.env.STLIB_AVFILTER = ['avfilter', 'swresample'] + conf.env.HAVE_AVCODEC = 1 + conf.env.STLIB_AVCODEC = ['avcodec'] + conf.env.LIB_AVCODEC = ['x264', 'z'] + conf.env.HAVE_AVUTIL = 1 + 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'] + conf.check_cfg(package = 'sndfile', args = '--cflags --libs', uselib_store = 'SNDFILE', mandatory = True) - conf.check_cfg(package = 'libdcp', atleast_version = '0.24', args = '--cflags --libs', 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