diff options
| author | Ben Reynwar | 2012-04-30 09:20:59 -0700 |
|---|---|---|
| committer | Ben Reynwar | 2012-04-30 09:20:59 -0700 |
| commit | 2817cf14147d6da2e7ef051fbbbf8228fd1c07ba (patch) | |
| tree | 0695ce3bcdbd75784198c28e6cb963c99ae5d0f6 /gnuradio-core/src/lib | |
| parent | e7f45e3c513242706a9e4aa36e99e33e79e66d4f (diff) | |
| parent | d7ecbd12be995ad6db7a53a5d6dd3fcb205c07ea (diff) | |
| download | gnuradio-2817cf14147d6da2e7ef051fbbbf8228fd1c07ba.tar.gz gnuradio-2817cf14147d6da2e7ef051fbbbf8228fd1c07ba.tar.bz2 gnuradio-2817cf14147d6da2e7ef051fbbbf8228fd1c07ba.zip | |
Merge branch 'master' of http://gnuradio.org/git/gnuradio
Diffstat (limited to 'gnuradio-core/src/lib')
| -rw-r--r-- | gnuradio-core/src/lib/filter/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/swig/gnuradio.i | 3 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/swig/gr_swig_block_magic.i | 10 |
3 files changed, 15 insertions, 1 deletions
diff --git a/gnuradio-core/src/lib/filter/CMakeLists.txt b/gnuradio-core/src/lib/filter/CMakeLists.txt index 02a72191c..facaff764 100644 --- a/gnuradio-core/src/lib/filter/CMakeLists.txt +++ b/gnuradio-core/src/lib/filter/CMakeLists.txt @@ -195,6 +195,9 @@ elseif(CMAKE_SYSTEM_PROCESSOR_x86 AND "${CMAKE_SYSTEM_PROCESSOR_x86}" STREQUAL " ${CMAKE_CURRENT_SOURCE_DIR}/short_dotprod_mmx.S ) elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)") + if(CMAKE_COMPILER_IS_GNUCXX) + add_definitions(-maltivec) + endif() list(APPEND gnuradio_core_sources ${CMAKE_CURRENT_SOURCE_DIR}/sysconfig_powerpc.cc ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_sysconfig_powerpc.cc diff --git a/gnuradio-core/src/lib/swig/gnuradio.i b/gnuradio-core/src/lib/swig/gnuradio.i index 239223851..3a421ad5d 100644 --- a/gnuradio-core/src/lib/swig/gnuradio.i +++ b/gnuradio-core/src/lib/swig/gnuradio.i @@ -20,6 +20,9 @@ * Boston, MA 02110-1301, USA. */ +// Disable warning about base class types +#pragma SWIG nowarn=401 + //////////////////////////////////////////////////////////////////////// // gnuradio.i // SWIG interface definition diff --git a/gnuradio-core/src/lib/swig/gr_swig_block_magic.i b/gnuradio-core/src/lib/swig/gr_swig_block_magic.i index cdc9fbe49..4016ae772 100644 --- a/gnuradio-core/src/lib/swig/gr_swig_block_magic.i +++ b/gnuradio-core/src/lib/swig/gr_swig_block_magic.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2010 Free Software Foundation, Inc. + * Copyright 2004,2010,2012 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -40,3 +40,11 @@ FULL_NAME ## _sptr.__repr__ = lambda self: "<gr_block %s (%d)>" % (self.name(), %} %enddef #endif + +%define GR_SWIG_BLOCK_MAGIC2(PKG, BASE_NAME) +%template(BASE_NAME ## _sptr) boost::shared_ptr<gr:: ## PKG ## :: ## BASE_NAME>; +%pythoncode %{ +BASE_NAME ## _sptr.__repr__ = lambda self: "<gr_block %s (%d)>" % (self.name(), self.unique_id()) +BASE_NAME = BASE_NAME.make; +%} +%enddef |