Changeset b257b60 for src/wscript_build

Timestamp:

Aug 12, 2015, 7:21:38 PM (9 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, pitchshift, sampler, timestretch, yinfft+

Children:

60fc05b

Parents:

3a1a5d6 (diff), 7b2d740 (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 'develop' into notes

File:

• src/wscript_build (modified) (2 diffs)

src/wscript_build

@@ -21 +21 @@
 # build libaubio.so (cshlib) and/or libaubio.a (cstlib)
 if ctx.env['DEST_OS'] in ['ios', 'iosimulator']:
-    build_features = ['cstlib']
+    build_features = ['cstlib', 'cshlib']
 elif ctx.env['DEST_OS'] in ['win32', 'win64']:
     build_features = ['cshlib']
@@ -30 +30 @@
     ctx(features = 'c ' + target,
             use = ['lib_objects'],
+            uselib = uselib,
             lib = 'm',
             target = 'aubio',
-            install_path = '${PREFIX}/lib',
             vnum = ctx.env['LIB_VERSION'])