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
33 uselib = []
44 uselib += ['M']
55 uselib += ['FFTW3', 'FFTW3F']
6+uselib += ['INTEL_IPP']
67 uselib += ['SAMPLERATE']
78 uselib += ['SNDFILE']
89 uselib += ['RUBBERBAND']
910 uselib += ['AVCODEC']
1011 uselib += ['AVFORMAT']
12+uselib += ['SWRESAMPLE']
1113 uselib += ['AVRESAMPLE']
1214 uselib += ['AVUTIL']
1315 uselib += ['BLAS']
@@ -24,19 +26,28 @@ ctx(features = 'c', · 10 unmodified lines
2426 if ctx.env['DEST_OS'] in ['ios', 'iosimulator']:
2527 build_features = ['cstlib', 'cshlib']
2628 elif ctx.env['DEST_OS'] in ['win32', 'win64']:
27− build_features = ['cstlib', 'cshlib']
29+ build_features = ['cstlib', 'cshlib gensyms']
2830 elif ctx.env['DEST_OS'] in ['emscripten']:
31+ build_features = ['cstlib','cshlib']
32+elif '--static' in ctx.env['LDFLAGS'] or '--static' in ctx.env['LINKFLAGS']:
33+ # static in cflags, ...
2934 build_features = ['cstlib']
30−else: #linux, darwin, android, mingw, ...
35+else:
36+ # linux, darwin, android, mingw, ...
3137 build_features = ['cstlib', 'cshlib']
3238
39+# also install static lib
40+from waflib.Tools.c import cstlib
41+cstlib.inst_to = '${LIBDIR}'
42+
3343 for target in build_features:
3444 ctx(features = 'c ' + target,
3545 use = uselib + ['lib_objects'],
3646 target = 'aubio',
47+ export_symbols_regex=r'(?:.*aubio|fvec|lvec|cvec|fmat|new|del)_.*',
3748 vnum = ctx.env['LIB_VERSION'])
3849
3950 # install headers, except _priv.h ones
40−ctx.install_files('${PREFIX}/include/aubio/',
51+ctx.install_files('${INCLUDEDIR}/aubio/',
4152 ctx.path.ant_glob('**/*.h', excl = ['**_priv.h', 'config.h']),
4253 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