From d9e5c35b9bbec5649d217ffc929cae7e4ee79f5a Mon Sep 17 00:00:00 2001 From: John Glover Date: Sun, 12 Aug 2012 17:34:48 +0100 Subject: Remove old SWIG modules. --- setup.py | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 9983d79..9547ae0 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,6 @@ except ImportError: macros = [] link_args = [] -swig_opts = ['-c++'] include_dirs = ['simpl', 'src/simpl', 'src/sms', 'src/sndobj', 'src/sndobj/rfftw', numpy_include, '/usr/local/include'] libs = ['m', 'fftw3', 'gsl', 'gslcblas'] @@ -76,21 +75,6 @@ sndobj_sources = map(lambda x: 'src/sndobj/' + x, sndobj_sources) sndobj_sources.extend(map(lambda x: 'src/sndobj/rfftw/' + x, fftw_sources)) sources.extend(sndobj_sources) -sndobj_sources.append("simpl/sndobj.i") - -sndobj_macros = [('PYTHON_WRAP', None)] -sndobj_macros.extend(macros) -sndobj_swig_opts = ['-c++', '-DNUMPY'] -sndobj_swig_opts.extend(swig_opts) -sndobj_include_dirs = ['src/sndobj/rfftw', 'src/sndobj'] -sndobj_include_dirs.extend(include_dirs) - -sndobj = Extension("simpl/_simplsndobj", - sources=sndobj_sources, - include_dirs=sndobj_include_dirs, - define_macros=sndobj_macros, - swig_opts=sndobj_swig_opts) - # ----------------------------------------------------------------------------- # SMS # ----------------------------------------------------------------------------- @@ -182,8 +166,7 @@ setup( author_email='j@johnglover.net', platforms=["Linux", "Mac OS-X", "Unix", "Windows"], version='0.3', - ext_modules=[base, peak_detection, partial_tracking, - synthesis, residual, sndobj], + ext_modules=[base, peak_detection, partial_tracking, synthesis, residual], cmdclass={'build_ext': build_ext}, packages=['simpl', 'simpl.plot'] ) -- cgit v1.2.3