Changeset a60f790


Ignore:
Timestamp:
Oct 3, 2017, 4:18:49 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
Children:
9dcc6e5
Parents:
dfe058a0 (diff), a500a392 (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 'winsymdef' (closes #126, closes waf-project/waf#2053)

Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • .appveyor.yml

    rdfe058a0 ra60f790  
    6565  # build libaubio
    6666  - python waf configure build --verbose --msvc_version="msvc 14.0"
    67   # build python module using libaubio dll
    68   - "python setup.py build"
  • scripts/build_mingw

    rdfe058a0 ra60f790  
    8181  # fix dll location (see https://github.com/waf-project/waf/issues/1860)
    8282  mv $DESTDIR/lib/libaubio-5.dll $DESTDIR/bin
    83   # generate def file (see https://github.com/aubio/aubio/issues/97)
    84   ( echo -e "EXPORTS"; $NM $DESTDIR/bin/libaubio-5.dll | grep T\  | \
    85     egrep "(aubio|fvec|cvec|lvec|fmat)" | sed 's/^.* T _\?//' ) \
    86     > $DESTDIR/bin/libaubio-5.def
     83  mv $DESTDIR/lib/libaubio-5.def $DESTDIR/bin
    8784  zip -r $DESTDIR.zip `basename $DESTDIR`
    8885  rm -rf $DESTDIR
  • scripts/get_waf.sh

    rdfe058a0 ra60f790  
    2323  tar xf $WAFTARBALL
    2424  pushd waf-$WAFVERSION
    25   NOCLIMB=1 python waf-light --tools=c_emscripten,syms $*
     25  NOCLIMB=1 python waf-light --tools=c_emscripten $*
    2626
    2727  popd
  • src/wscript_build

    rdfe058a0 ra60f790  
    2626    build_features = ['cstlib', 'cshlib']
    2727elif ctx.env['DEST_OS'] in ['win32', 'win64']:
    28     build_features = ['cstlib', 'cshlib']
     28    build_features = ['cstlib', 'cshlib gensyms']
    2929elif ctx.env['DEST_OS'] in ['emscripten']:
    3030    build_features = ['cstlib','cshlib']
     
    3838# also install static lib
    3939from waflib.Tools.c import cstlib
    40 from waflib.Tools.fc import fcstlib
    41 fcstlib.inst_to = cstlib.inst_to = '${LIBDIR}'
     40cstlib.inst_to = '${LIBDIR}'
    4241
    4342for target in build_features:
     
    4544            use = uselib + ['lib_objects'],
    4645            target = 'aubio',
     46            export_symbols_regex=r'(?:.*aubio|fvec|lvec|cvec|fmat|new|del)_.*',
    4747            vnum = ctx.env['LIB_VERSION'])
    4848
  • wscript

    rdfe058a0 ra60f790  
    104104    ctx.load('waf_unit_test')
    105105    ctx.load('gnu_dirs')
     106    ctx.load('waf_gensyms', tooldir='.')
    106107
    107108def configure(ctx):
     
    119120    ctx.load('waf_unit_test')
    120121    ctx.load('gnu_dirs')
     122    ctx.load('waf_gensyms', tooldir='.')
    121123
    122124    # check for common headers
Note: See TracChangeset for help on using the changeset viewer.