diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2013-03-12 14:18:21 -0700 |
|---|---|---|
| committer | Nicholas Corgan <nick.corgan@ettus.com> | 2013-03-12 14:18:21 -0700 |
| commit | 7d87d72624495114e355fab59d4f2a02ae8eda5f (patch) | |
| tree | 207dd9351df1cc8b7cb94aa358cad7e178132618 | |
| parent | 45f9c0a5792526279ebf5ffa6a4853c7e2de6dd6 (diff) | |
MSVC fixes
* blocks: changed peak_detector_XX from GR_CORE_API to BLOCKS_API
* blocks: fxpt_nco does not export symbols
* Added /bigobj flag to MSVC compiiles to allow for larger object files
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-blocks/include/blocks/fxpt_nco.h | 2 | ||||
| -rw-r--r-- | gr-blocks/include/blocks/peak_detector_XX.h.t | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 64eccbbeb2..2c0a4e9096 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,6 +96,7 @@ if(MSVC) ) add_definitions(-DHAVE_CONFIG_H) add_definitions(/MP) #build with multiple processors + add_definitions(/bigobj) #allow for larger object files endif(MSVC) ######################################################################## diff --git a/gr-blocks/include/blocks/fxpt_nco.h b/gr-blocks/include/blocks/fxpt_nco.h index 0faa731763..7db20fbb3a 100644 --- a/gr-blocks/include/blocks/fxpt_nco.h +++ b/gr-blocks/include/blocks/fxpt_nco.h @@ -41,7 +41,7 @@ namespace gr { * to the fxpt_vco can also be used to set or adjust the current * phase. */ - class BLOCKS_API fxpt_nco + class fxpt_nco { private: uint32_t d_phase; diff --git a/gr-blocks/include/blocks/peak_detector_XX.h.t b/gr-blocks/include/blocks/peak_detector_XX.h.t index 1c8ba0652f..fead53d208 100644 --- a/gr-blocks/include/blocks/peak_detector_XX.h.t +++ b/gr-blocks/include/blocks/peak_detector_XX.h.t @@ -38,7 +38,7 @@ namespace gr { * If a peak is detected, this block outputs a 1, * or it outputs 0's. */ - class GR_CORE_API @NAME@ : virtual public gr_sync_block + class BLOCKS_API @NAME@ : virtual public gr_sync_block { public: // gr::blocks::@NAME@::sptr |