Ignore:
Timestamp:
Mar 10, 2017, 2:26:32 PM (7 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, sampler
Children:
ee8a57c
Parents:
00d0275 (diff), 67b6618 (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 awhitening

File:
1 edited

Legend:

Unmodified
Added
Removed
  • examples/wscript_build

    r00d0275 r155cc10  
    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']
     3import os.path
     4
     5uselib = ['aubio']
    116uselib += ['JACK']
    12 uselib += ['BLAS']
    137
     8includes = ['../src']
    149utils_source = ['utils.c', 'jackio.c']
    1510programs_source = ctx.path.ant_glob('*.c', excl = utils_source)
     
    1813bld(features = 'c',
    1914        source = utils_source,
    20         includes = ['../src'],
    21         uselib = uselib,
     15        includes = includes,
     16        use = uselib,
    2217        target = 'utilsio')
    2318
    2419# loop over all *.c filenames in examples to build them all
    2520for source_file in programs_source:
     21    target = os.path.basename(os.path.splitext(str(source_file))[0])
    2622    bld(features = 'c cprogram',
    27             includes = '../src',
    28             lib = 'm',
    29             use = ['aubio', 'utilsio'],
    30             uselib = uselib,
    3123            source = source_file,
    32             target = str(source_file).split('.')[0]
    33             )
     24            target = target,
     25            includes = includes,
     26            use = uselib + ['utilsio'],
     27       )
Note: See TracChangeset for help on using the changeset viewer.