diff options
| author | John Glover <j@johnglover.net> | 2012-10-30 08:19:32 +0000 |
|---|---|---|
| committer | John Glover <j@johnglover.net> | 2012-10-30 08:19:32 +0000 |
| commit | 267a9460f385f31bf71635ae6f6f8e1772bae939 (patch) | |
| tree | f6b0c68b63d12a79ad172bd88cd568638c29e264 /setup.py | |
| parent | 7d4011245946898f73205b5713767579304fdecf (diff) | |
| download | simpl-267a9460f385f31bf71635ae6f6f8e1772bae939.tar.gz simpl-267a9460f385f31bf71635ae6f6f8e1772bae939.tar.bz2 simpl-267a9460f385f31bf71635ae6f6f8e1772bae939.zip | |
Fix compiling Python extension on Ubuntu 12.04
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 18 |
1 files changed, 14 insertions, 4 deletions
@@ -37,6 +37,7 @@ link_args = [] include_dirs = ['simpl', 'src/simpl', 'src/sms', 'src/sndobj', 'src/loris', 'src/mq', numpy_include, '/usr/local/include'] libs = ['m', 'fftw3', 'gsl', 'gslcblas'] +compile_args = ['-DMERSENNE_TWISTER', '-DHAVE_FFTW3_H'] sources = [] # ----------------------------------------------------------------------------- @@ -97,7 +98,7 @@ peak_detection = Extension( 'src/simpl/exceptions.cpp'], include_dirs=include_dirs, libraries=libs, - extra_compile_args=['-DMERSENNE_TWISTER', '-DHAVE_FFTW3_H'], + extra_compile_args=compile_args, language='c++' ) @@ -106,10 +107,12 @@ peak_detection = Extension( # ----------------------------------------------------------------------------- partial_tracking = Extension( 'simpl.partial_tracking', - sources=['simpl/partial_tracking.pyx', + sources=sources + ['simpl/partial_tracking.pyx', 'src/simpl/partial_tracking.cpp', 'src/simpl/base.cpp', 'src/simpl/exceptions.cpp'], + libraries=libs, + extra_compile_args=compile_args, include_dirs=include_dirs, language='c++' ) @@ -119,10 +122,12 @@ partial_tracking = Extension( # ----------------------------------------------------------------------------- synthesis = Extension( 'simpl.synthesis', - sources=['simpl/synthesis.pyx', + sources=sources + ['simpl/synthesis.pyx', 'src/simpl/synthesis.cpp', 'src/simpl/base.cpp', 'src/simpl/exceptions.cpp'], + libraries=libs, + extra_compile_args=compile_args, include_dirs=include_dirs, language='c++' ) @@ -132,10 +137,15 @@ synthesis = Extension( # ----------------------------------------------------------------------------- residual = Extension( 'simpl.residual', - sources=['simpl/residual.pyx', + sources=sources + ['simpl/residual.pyx', + 'src/simpl/peak_detection.cpp', + 'src/simpl/partial_tracking.cpp', + 'src/simpl/synthesis.cpp', 'src/simpl/residual.cpp', 'src/simpl/base.cpp', 'src/simpl/exceptions.cpp'], + libraries=libs, + extra_compile_args=compile_args, include_dirs=include_dirs, language='c++' ) |