Changeset fc9c60e for wscript


Ignore:
Timestamp:
Jul 2, 2020, 3:34:26 PM (5 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/cnn, feature/crepe, fix/ffmpeg5, master
Children:
e836160
Parents:
1ec59e4 (diff), 9c730b5 (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 feature/autosink

File:
1 edited

Legend:

Unmodified
Added
Removed
  • wscript

    r1ec59e4 rfc9c60e  
    4646                    ' or without (--build-type=debug)' \
    4747                    ' compiler opimizations [default: release]')
     48    ctx.add_option('--debug', action = 'store_const',
     49            dest = 'build_type', const = 'debug',
     50            help = 'build in debug mode (see --build-type)')
     51    ctx.add_option('--nodeps', action = 'store_const',
     52            dest = 'nodeps', const = 'debug',
     53            help = 'build with no external dependencies')
    4854    add_option_enable_disable(ctx, 'fftw3f', default = False,
    4955            help_str = 'compile with fftw3f instead of ooura (recommended)',
     
    130136        target_platform = ctx.options.target_platform
    131137
     138    if ctx.options.nodeps:
     139        external_deps = [
     140                'sndfile',
     141                'samplerate',
     142                'jack',
     143                'avcodec',
     144                'blas',
     145                'fftw3',
     146                'fftw3f',
     147        ]
     148        for d in external_deps:
     149            if not hasattr(ctx.options, 'enable_' + d):
     150                raise ctx.errors.ConfigurationError ('--enable-%s missing from options' % d)
     151            if getattr(ctx.options, 'enable_' + d) == True:
     152                msg = 'Option --nodeps can not be used along with --enable-%s' % d
     153                raise ctx.errors.ConfigurationError (msg)
     154            elif getattr(ctx.options, 'enable_' + d) is None:
     155                msg = 'Option --nodeps used but automatic detection with --enable-%s' % d
     156                ctx.msg('Warning', msg)
     157            setattr(ctx.options, 'enable_' + d, False)
     158
    132159    from waflib import Options
    133160
Note: See TracChangeset for help on using the changeset viewer.