Changeset 21234ee for src/wscript_build

Timestamp:

Dec 18, 2013, 8:07:27 AM (11 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:

6465d7f

Parents:

1573b16 (diff), c3c6305 (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' of aubio.org:/git/aubio/aubio into develop

File:

• src/wscript_build (modified) (3 diffs)

src/wscript_build

@@ -10 +10 @@
 uselib += ['AVRESAMPLE']
 uselib += ['AVUTIL']
-uselib += ['JACK']
 
 ctx(features = 'c',
@@ -22 +21 @@
 if ctx.env['DEST_OS'] in ['ios', 'iosimulator']:
     build_features = ['cstlib']
+elif ctx.env['DEST_OS'] in ['win32', 'win64']:
+    build_features = ['cshlib']
 else: #linux, darwin, android, mingw, ...
     build_features = ['cshlib', 'cstlib']
@@ -28 +29 @@
   ctx(features = 'c ' + target,
       use = ['lib_objects'], #source = source,
+      lib = 'm',
       target = 'aubio',
       install_path = '${PREFIX}/lib',