Ignore:
Timestamp:
Jun 22, 2016, 1:00:10 PM (9 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+
Children:
4b9443c4
Parents:
60fc05b (diff), 6769586 (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 notes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • examples/wscript_build

    r60fc05b rf264b17  
    11# vim:set syntax=python:
    22
    3 uselib = []
    4 uselib += ['FFTW3', 'FFTW3F']
    5 uselib += ['SAMPLERATE']
    6 uselib += ['SNDFILE']
    7 uselib += ['AVCODEC']
    8 uselib += ['AVFORMAT']
    9 uselib += ['AVRESAMPLE']
    10 uselib += ['AVUTIL']
     3uselib = ['aubio']
    114uselib += ['JACK']
    125
     6includes = ['../src']
    137utils_source = ['utils.c', 'jackio.c']
    148programs_source = ctx.path.ant_glob('*.c', excl = utils_source)
     
    1711bld(features = 'c',
    1812        source = utils_source,
    19         includes = ['../src'],
    20         uselib = uselib,
     13        includes = includes,
     14        use = uselib,
    2115        target = 'utilsio')
    2216
     
    2418for source_file in programs_source:
    2519    bld(features = 'c cprogram',
    26             includes = '../src',
    27             lib = 'm',
    28             use = ['aubio', 'utilsio'],
    29             uselib = uselib,
    3020            source = source_file,
    31             target = str(source_file).split('.')[0]
    32             )
     21            target = str(source_file).split('.')[0],
     22            includes = includes,
     23            use = uselib + ['utilsio'],
     24       )
Note: See TracChangeset for help on using the changeset viewer.