diff options
| author | jcorgan | 2009-02-10 04:53:37 +0000 |
|---|---|---|
| committer | jcorgan | 2009-02-10 04:53:37 +0000 |
| commit | 7783dc88c6acf839b59c7c3358094f85e0012ada (patch) | |
| tree | 42b3ed5759abef32e75b28d9936aa660cc47ab68 /gnuradio-core/src/lib/swig/gnuradio.i | |
| parent | 417a36b82e23fa681e361541c1824ba4de811a7a (diff) | |
| download | gnuradio-7783dc88c6acf839b59c7c3358094f85e0012ada.tar.gz gnuradio-7783dc88c6acf839b59c7c3358094f85e0012ada.tar.bz2 gnuradio-7783dc88c6acf839b59c7c3358094f85e0012ada.zip | |
Merged r10385:10413 from michaelld/swig_tweaks into trunk. Passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10414 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-core/src/lib/swig/gnuradio.i')
| -rw-r--r-- | gnuradio-core/src/lib/swig/gnuradio.i | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/gnuradio-core/src/lib/swig/gnuradio.i b/gnuradio-core/src/lib/swig/gnuradio.i index aa5174a59..7d0241f1c 100644 --- a/gnuradio-core/src/lib/swig/gnuradio.i +++ b/gnuradio-core/src/lib/swig/gnuradio.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2003,2004 Free Software Foundation, Inc. + * Copyright 2003,2004,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -25,23 +25,21 @@ // SWIG interface definition //////////////////////////////////////////////////////////////////////// - -#ifndef SWIGIMPORTED -%module(directors="1") gnuradio_swig_py_runtime -#endif - //////////////////////////////////////////////////////////////////////// // Headers - %{ +#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix #include <gr_types.h> #include <stddef.h> // size_t %} %feature("autodoc","1"); -%include <shared_ptr.i> +// local file +%include <gr_shared_ptr.i> + +// non-local SWIG files %include <stl.i> %include <std_complex.i> %include <std_except.i> @@ -81,11 +79,9 @@ namespace std { //////////////////////////////////////////////////////////////////////// -%include <runtime.i> - // %include <general.i> - // %include <filter.i> - // %include <io.i> - -// %include <atsc.i> +#ifndef SW_RUNTIME +// import runtime.i for all but sw_runtime, since it needs to %include +%import <runtime.i> +#endif //////////////////////////////////////////////////////////////////////// |