Changeset fc117d0 for python/setup.py

Timestamp:

Feb 11, 2013, 11:06:28 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:

050a8f3

Parents:

5314432 (diff), 88fc249 (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 from develop

File:

• python/setup.py (moved) (moved from interfaces/python/setup.py) (2 diffs)

python/setup.py

@@ -2 +2 @@
 
 from distutils.core import setup, Extension
+from generator import generate_object_files
+import os.path
+import numpy
 
-from generator import generate_object_files
-
-import os.path
-
-library_dirs = ['../../build/src', '../../src/.libs']
-include_dirs = ['../../build/src', '../../src', '.' ]
+library_dirs = ['../build/src', '../src/.libs']
+include_dirs = ['../build/src', '../src', '.' ]
 library_dirs = filter (lambda x: os.path.isdir(x), library_dirs)
 include_dirs = filter (lambda x: os.path.isdir(x), include_dirs)
@@ -24 +23 @@
             # generated files
             ] + generate_object_files(),
-            include_dirs = include_dirs,
+            include_dirs = include_dirs + [ numpy.get_include() ],
             library_dirs = library_dirs,
             libraries=['aubio'])