Merge branch 'gr_filter'

2 files changed, 7 insertions, 10 deletions

diff --git a/gr-fft/include/fft/fft.h b/gr-fft/include/fft/fft.h
index 5cc2e21e8..e3fd3f278 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/lib/CMakeLists.txt b/gr-fft/lib/CMakeLists.txt
index e2f17a183..ea1248fba 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})
 
 ########################################################################