Changeset 41399bd for python

Timestamp:

Mar 5, 2013, 8:10:57 PM (12 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:

4d3b573

Parents:

63f6c13

Message:

ext/aubio-types.h: use -DLOCAL_AUBIO to build against local aubio

Location:

python

Files:

• ext/aubio-types.h (modified) (1 diff)
• setup.py (modified) (2 diffs)

python/ext/aubio-types.h

@@ -23 +23 @@
 
 #define AUBIO_UNSTABLE 1
+#ifdef LOCAL_AUBIO
 #include "aubio.h"
+#else
+#include "aubio/aubio.h"
+#endif
 
 #define Py_default_vector_length 1024

python/setup.py

@@ -12 +12 @@
         + AUBIO_VERSION_STATUS
 
-library_dirs = ['../build/src']
-include_dirs = ['../src'] # aubio.h
-include_dirs += ['../build/src'] # config.h
+include_dirs = []
+library_dirs = []
+define_macros = []
+
 include_dirs += ['ext']
-include_dirs += ['gen']
-#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)
-
-generated_object_files = []
+include_dirs += [ numpy.get_include() ]
 
 output_path = 'gen'
+generated_object_files = []
 
 if not os.path.isdir(output_path):
     from generator import generate_object_files
     generated_object_files = generate_object_files(output_path)
+    # define include dirs
 else:
     import glob
     generated_object_files = glob.glob(os.path.join(output_path, '*.c'))
+include_dirs += [output_path]
+
+if os.path.isfile('../src/aubio.h'):
+    define_macros += [('USE_LOCAL_AUBIO', 1)]
+    include_dirs += ['../src'] # aubio.h
+    include_dirs += ['../build/src'] # config.h
+    library_dirs += ['../build/src']
 
 aubio_extension = Extension("aubio._aubio", [
@@ -46 +50 @@
             # generated files
             ] + generated_object_files,
-        include_dirs = include_dirs + [ numpy.get_include() ],
+        include_dirs = include_dirs,
         library_dirs = library_dirs,
+        define_macros = define_macros,
         libraries=['aubio'])