Changeset 633400d for src/wscript_build

Timestamp:

Dec 5, 2018, 10:34:39 PM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/cnn, feature/crepe, feature/pitchshift, feature/timestretch, fix/ffmpeg5, master

Children:

283a619a

Parents:

5b46bc3 (diff), f19db54 (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 feature/pitchshift

File:

• src/wscript_build (modified) (4 diffs)

src/wscript_build

@@ -4 +4 @@
 uselib += ['M']
 uselib += ['FFTW3', 'FFTW3F']
+uselib += ['INTEL_IPP']
 uselib += ['SAMPLERATE']
 uselib += ['SNDFILE']
@@ -9 +10 @@
 uselib += ['AVCODEC']
 uselib += ['AVFORMAT']
+uselib += ['SWRESAMPLE']
 uselib += ['AVRESAMPLE']
 uselib += ['AVUTIL']
@@ -25 +27 @@
     build_features = ['cstlib', 'cshlib']
 elif ctx.env['DEST_OS'] in ['win32', 'win64']:
+    build_features = ['cstlib', 'cshlib gensyms']
+elif ctx.env['DEST_OS'] in ['emscripten']:
+    build_features = ['cstlib','cshlib']
+elif '--static' in ctx.env['LDFLAGS'] or '--static' in ctx.env['LINKFLAGS']:
+    # static in cflags, ...
+    build_features = ['cstlib']
+else:
+    # linux, darwin, android, mingw, ...
     build_features = ['cstlib', 'cshlib']
-elif ctx.env['DEST_OS'] in ['emscripten']:
-    build_features = ['cstlib']
-else: #linux, darwin, android, mingw, ...
-    build_features = ['cstlib', 'cshlib']
+
+# also install static lib
+from waflib.Tools.c import cstlib
+cstlib.inst_to = '${LIBDIR}'
 
 for target in build_features:
@@ -35 +45 @@
             use = uselib + ['lib_objects'],
             target = 'aubio',
+            export_symbols_regex=r'(?:.*aubio|fvec|lvec|cvec|fmat|new|del)_.*',
             vnum = ctx.env['LIB_VERSION'])
 
 # install headers, except _priv.h ones
-ctx.install_files('${PREFIX}/include/aubio/',
+ctx.install_files('${INCLUDEDIR}/aubio/',
         ctx.path.ant_glob('**/*.h', excl = ['**_priv.h', 'config.h']),
         relative_trick=True)