diff options
| author | Ben Reynwar <ben@reynwar.net> | 2012-08-08 14:26:07 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2012-08-08 14:26:07 -0700 |
| commit | 9be7c30d6df3fb8bd75db0659fa7a7d163d65657 (patch) | |
| tree | eaca0dec00f1aad0c8b883944f40e7c9730644f3 /gr-fft | |
| parent | c27d9d3bac3a870fee9ec8c4289ae65ab4f2decc (diff) | |
| parent | 9305abf4be93205cf240e99ce7136702f724c490 (diff) | |
Merge branch 'master' into comments
Diffstat (limited to 'gr-fft')
| -rw-r--r-- | gr-fft/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-fft/include/fft/fft.h | 6 | ||||
| -rw-r--r-- | gr-fft/include/fft/fft_vcc.h | 2 | ||||
| -rw-r--r-- | gr-fft/include/fft/fft_vfc.h | 2 | ||||
| -rw-r--r-- | gr-fft/include/fft/goertzel_fc.h | 2 | ||||
| -rw-r--r-- | gr-fft/lib/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | gr-fft/swig/CMakeLists.txt | 2 |
7 files changed, 14 insertions, 15 deletions
diff --git a/gr-fft/CMakeLists.txt b/gr-fft/CMakeLists.txt index 9ee3383413..7d76dc7f93 100644 --- a/gr-fft/CMakeLists.txt +++ b/gr-fft/CMakeLists.txt @@ -89,10 +89,10 @@ add_subdirectory(lib) if(ENABLE_PYTHON) add_subdirectory(swig) add_subdirectory(python) -# add_subdirectory(grc) + add_subdirectory(grc) endif(ENABLE_PYTHON) #add_subdirectory(examples) -#add_subdirectory(doc) +add_subdirectory(doc) ######################################################################## # Create Pkg Config File diff --git a/gr-fft/include/fft/fft.h b/gr-fft/include/fft/fft.h index 5cc2e21e81..e3fd3f278a 100644 --- a/gr-fft/include/fft/fft.h +++ b/gr-fft/include/fft/fft.h @@ -37,15 +37,15 @@ namespace gr { /*! \brief Helper function for allocating complex fft buffers */ - gr_complex* malloc_complex(int size); + FFT_API gr_complex* malloc_complex(int size); /*! \brief Helper function for allocating float fft buffers */ - float* malloc_float(int size); + FFT_API float* malloc_float(int size); /*! \brief Helper function for freeing fft buffers */ - void free(void *b); + FFT_API void free(void *b); /*! * \brief Export reference to planner mutex for those apps that diff --git a/gr-fft/include/fft/fft_vcc.h b/gr-fft/include/fft/fft_vcc.h index 561ae858d2..cb07b166d2 100644 --- a/gr-fft/include/fft/fft_vcc.h +++ b/gr-fft/include/fft/fft_vcc.h @@ -40,7 +40,7 @@ namespace gr { * \brief Compute forward or reverse FFT. complex vector in / complex vector out. * \ingroup dft_blk */ - static FFT_API sptr make(int fft_size, bool forward, + static sptr make(int fft_size, bool forward, const std::vector<float> &window, bool shift=false, int nthreads=1); diff --git a/gr-fft/include/fft/fft_vfc.h b/gr-fft/include/fft/fft_vfc.h index fc48ceefea..ec441d66a8 100644 --- a/gr-fft/include/fft/fft_vfc.h +++ b/gr-fft/include/fft/fft_vfc.h @@ -40,7 +40,7 @@ namespace gr { * \brief Compute forward or reverse FFT. float vector in / complex vector out. * \ingroup dft_blk */ - static FFT_API sptr make(int fft_size, bool forward, + static sptr make(int fft_size, bool forward, const std::vector<float> &window, int nthreads=1); diff --git a/gr-fft/include/fft/goertzel_fc.h b/gr-fft/include/fft/goertzel_fc.h index 4d3fa8dcf8..5b3c8f1c49 100644 --- a/gr-fft/include/fft/goertzel_fc.h +++ b/gr-fft/include/fft/goertzel_fc.h @@ -40,7 +40,7 @@ namespace gr { * \brief Goertzel single-bin DFT calculation. * \ingroup dft_blk */ - static FFT_API sptr make(int rate, int len, float freq); + static sptr make(int rate, int len, float freq); virtual void set_freq (float freq) = 0; diff --git a/gr-fft/lib/CMakeLists.txt b/gr-fft/lib/CMakeLists.txt index e2f17a1830..ea1248fbac 100644 --- a/gr-fft/lib/CMakeLists.txt +++ b/gr-fft/lib/CMakeLists.txt @@ -21,19 +21,16 @@ # Setup the include and linker paths ######################################################################## include_directories( - ${GNURADIO_CORE_INCLUDE_DIRS} - ${GR_FFT_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} + ${GNURADIO_CORE_INCLUDE_DIRS} + ${GR_FFT_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${FFTW3F_INCLUDE_DIRS} ) -include_directories(${FFT_INCLUDE_DIRS}) link_directories(${FFT_LIBRARY_DIRS}) - -include_directories(${Boost_INCLUDE_DIRS}) link_directories(${Boost_LIBRARY_DIRS}) - -include_directories(${FFTW3F_INCLUDE_DIRS}) link_directories(${FFTW3F_LIBRARY_DIRS}) ######################################################################## diff --git a/gr-fft/swig/CMakeLists.txt b/gr-fft/swig/CMakeLists.txt index 7ea41f220e..3276669857 100644 --- a/gr-fft/swig/CMakeLists.txt +++ b/gr-fft/swig/CMakeLists.txt @@ -23,6 +23,8 @@ include(GrPython) include(GrSwig) +set(GR_SWIG_TARGET_DEPS core_swig) + set(GR_SWIG_INCLUDE_DIRS ${GR_FFT_INCLUDE_DIRS} ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} |