History

Merge branch 'master' into feature/pitchshift

Paul Brossier committed 7 years ago

Commit 633400d2 parents 5b46bc3 f19db54230 files · +12450 −4607Browse files

Showing the changes to src/wscript_build (1 of 230 files). Show all

Unified · Split

src/wscript_build+14−3
@@ -3,11 +3,13 @@ · 2 unmodified lines
3uselib = []3uselib = []
4uselib += ['M']4uselib += ['M']
5uselib += ['FFTW3', 'FFTW3F']5uselib += ['FFTW3', 'FFTW3F']
6uselib += ['INTEL_IPP']
6uselib += ['SAMPLERATE']7uselib += ['SAMPLERATE']
7uselib += ['SNDFILE']8uselib += ['SNDFILE']
8uselib += ['RUBBERBAND']9uselib += ['RUBBERBAND']
9uselib += ['AVCODEC']10uselib += ['AVCODEC']
10uselib += ['AVFORMAT']11uselib += ['AVFORMAT']
12uselib += ['SWRESAMPLE']
11uselib += ['AVRESAMPLE']13uselib += ['AVRESAMPLE']
12uselib += ['AVUTIL']14uselib += ['AVUTIL']
13uselib += ['BLAS']15uselib += ['BLAS']
@@ -24,19 +26,28 @@ ctx(features = 'c', · 10 unmodified lines
24if ctx.env['DEST_OS'] in ['ios', 'iosimulator']:26if ctx.env['DEST_OS'] in ['ios', 'iosimulator']:
25 build_features = ['cstlib', 'cshlib']27 build_features = ['cstlib', 'cshlib']
26elif ctx.env['DEST_OS'] in ['win32', 'win64']:28elif ctx.env['DEST_OS'] in ['win32', 'win64']:
27 build_features = ['cstlib', 'cshlib']29 build_features = ['cstlib', 'cshlib gensyms']
28elif ctx.env['DEST_OS'] in ['emscripten']:30elif ctx.env['DEST_OS'] in ['emscripten']:
31 build_features = ['cstlib','cshlib']
32elif '--static' in ctx.env['LDFLAGS'] or '--static' in ctx.env['LINKFLAGS']:
33 # static in cflags, ...
29 build_features = ['cstlib']34 build_features = ['cstlib']
30else: #linux, darwin, android, mingw, ...35else:
36 # linux, darwin, android, mingw, ...
31 build_features = ['cstlib', 'cshlib']37 build_features = ['cstlib', 'cshlib']
32 38
39# also install static lib
40from waflib.Tools.c import cstlib
41cstlib.inst_to = '${LIBDIR}'
42
33for target in build_features:43for target in build_features:
34 ctx(features = 'c ' + target,44 ctx(features = 'c ' + target,
35 use = uselib + ['lib_objects'],45 use = uselib + ['lib_objects'],
36 target = 'aubio',46 target = 'aubio',
47 export_symbols_regex=r'(?:.*aubio|fvec|lvec|cvec|fmat|new|del)_.*',
37 vnum = ctx.env['LIB_VERSION'])48 vnum = ctx.env['LIB_VERSION'])
38 49
39# install headers, except _priv.h ones50# install headers, except _priv.h ones
40ctx.install_files('${PREFIX}/include/aubio/',51ctx.install_files('${INCLUDEDIR}/aubio/',
41 ctx.path.ant_glob('**/*.h', excl = ['**_priv.h', 'config.h']),52 ctx.path.ant_glob('**/*.h', excl = ['**_priv.h', 'config.h']),
42 relative_trick=True)53 relative_trick=True)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t