X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=657ddc1fafbe8025b9735f45eae07e8edfbb49e7;hb=bf596f1dca9c2b08e6208d78ebd6e4e284ca2d9e;hp=0957fdb39f47c7f94300f12e33d5927268a478da;hpb=6e2ee564f38f2fa924f1d1c4fb95391cdee63bb6;p=dcpomatic.git diff --git a/wscript b/wscript index 0957fdb39..657ddc1fa 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.68beta9' +VERSION = '0.71pre' def options(opt): opt.load('compiler_cxx') @@ -19,7 +19,7 @@ def configure(conf): 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', '-Wall', '-Wno-attributes']) + conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', '-Wall', '-Wno-attributes', '-Wextra']) if conf.options.target_windows: conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H', '-DUNICODE']) @@ -151,6 +151,36 @@ 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.recurse('src') conf.recurse('test') @@ -176,7 +206,7 @@ def build(bld): 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* *build-windows doc/manual/pdf doc/manual/html' + ctx.excl = 'TODO core *~ src/wx/*~ src/lib/*~ builds/*~ doc/manual/*~ src/tools/*~ *.pyc .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'):