X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=de92c182aa923305be0bc645673a02734091c1ec;hb=40c36996cf628aa0a0b6c32f24e83a269932b0ac;hp=4ed86f10681063ad6536f52e0397b17520af3874;hpb=b201cac91f9562a25b1bdec85c1c420b51d22b1f;p=dcpomatic.git diff --git a/wscript b/wscript index 4ed86f106..de92c182a 100644 --- a/wscript +++ b/wscript @@ -3,17 +3,14 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.40' +VERSION = '0.59pre' def options(opt): opt.load('compiler_cxx') opt.load('winres') - opt.add_option('--debug-hash', action='store_true', default = False, help = 'print hashes of data at various points') 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('--ffmpeg-083', action='store_true', default = False, help = 'Use FFmpeg version in Ubuntu 12.04') opt.add_option('--target-windows', action='store_true', default = False, help = 'set up to do a cross-compile to Windows') def configure(conf): @@ -22,11 +19,15 @@ def configure(conf): conf.load('winres') conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', '-Wall', '-Wno-attributes']) - conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_VERSION="%s"' % VERSION]) 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,37 +35,28 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-DDVDOMATIC_POSIX') boost_lib_suffix = '' boost_thread = 'boost_thread' + conf.env.append_value('LINKFLAGS', '-pthread') - conf.env.DEBUG_HASH = conf.options.debug_hash 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.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') + conf.env.append_value('CXXFLAGS', ['-g', '-DDVDOMATIC_DEBUG']) else: - conf.env.append_value('CXXFLAGS', '-O3') - - if conf.options.ffmpeg_083: - conf.env.append_value('CXXFLAGS', '-DDVDOMATIC_FFMPEG_0_8_3') + conf.env.append_value('CXXFLAGS', '-O2') - 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 = 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.check_cfg(package = 'sndfile', args = '--cflags --libs', uselib_store = 'SNDFILE', mandatory = True) - conf.check_cfg(package = 'libdcp', atleast_version = '0.07', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True) + conf.check_cfg(package = 'libdcp', atleast_version = '0.32', 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 @@ -97,6 +89,21 @@ def configure(conf): lib = ['boost_filesystem%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix], uselib_store = 'BOOST_FILESYSTEM') + conf.check_cxx(fragment = """ + #include \n + int main() { boost::gregorian::day_clock::local_day(); }\n + """, msg = 'Checking for boost datetime library', + libpath = '/usr/local/lib', + 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); } @@ -127,8 +134,10 @@ def build(bld): for r in ['22x22', '32x32', '48x48', '64x64', '128x128']: bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dvdomatic.png' % r) + bld.add_post_fun(post) + def dist(ctx): - ctx.excl = 'TODO core *~ src/wx/*~ src/lib/*~ .waf* build .git deps alignment hacks sync *.tar.bz2 *.exe .lock*' + ctx.excl = 'TODO core *~ src/wx/*~ src/lib/*~ .waf* build .git deps alignment hacks sync *.tar.bz2 *.exe .lock* *build-windows doc/manual/pdf doc/manual/html' def create_version_cc(version): if os.path.exists('.git'): @@ -151,3 +160,6 @@ def create_version_cc(version): print('Could not open src/lib/version.cc for writing\n') sys.exit(-1) +def post(ctx): + if ctx.cmd == 'install': + ctx.exec_command('/sbin/ldconfig')