Changeset b201912 for wscript

Timestamp:

Apr 11, 2017, 1:49:44 AM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

sampler

Children:

04d0c89

Parents:

fbafd2c (diff), b762f8d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into sampler

Fixed conflicts:

python/lib/gen_external.py
src/io/source_avcodec.c

File:

• wscript (modified) (2 diffs)

wscript

@@ -334 +334 @@
                 mandatory = ctx.options.enable_avcodec)
         ctx.check_cfg(package = 'libswresample',
-                args = '--cflags --libs libswresample >= 2.3.0',
+                args = '--cflags --libs libswresample >= 1.2.0',
                 uselib_store = 'SWRESAMPLE',
                 mandatory = False)
@@ -456 +456 @@
     # build documentation from source files using doxygen
     if bld.env['DOXYGEN']:
-        bld( name = 'doxygen', rule = 'doxygen ${SRC} > /dev/null',
+        bld.env.VERSION = VERSION
+        rule = '( cat ${SRC} && echo PROJECT_NUMBER=${VERSION}; )'
+        rule += ' | doxygen - > /dev/null'
+        bld( name = 'doxygen', rule = rule,
                 source = 'doc/web.cfg',
                 target = '../doc/web/html/index.html',