diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-11-12 22:10:18 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-11-12 22:10:18 -0500 |
| commit | ce4e0e692de8802d458fd6c504c79f0f877d9557 (patch) | |
| tree | 49501d5bfc32853332d78c9a8f1ba6ee1348f5a8 | |
| parent | 0613db37aa3d87eb3cce2841fa210abc6b7f9c22 (diff) | |
| parent | 5b568abe194f027860670317915c27c174fab52e (diff) | |
Merge branch 'next' of gnuradio.org:gnuradio into next
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_fxpt_nco.h | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_fxpt_vco.h | 2 | ||||
| -rw-r--r-- | gr-analog/include/analog/frequency_modulator_fc.h | 4 | ||||
| -rw-r--r-- | gr-digital/lib/CMakeLists.txt | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/gnuradio-core/src/lib/general/gr_fxpt_nco.h b/gnuradio-core/src/lib/general/gr_fxpt_nco.h index 9473e6ddbc..9defa083da 100644 --- a/gnuradio-core/src/lib/general/gr_fxpt_nco.h +++ b/gnuradio-core/src/lib/general/gr_fxpt_nco.h @@ -30,7 +30,7 @@ * \brief Numerically Controlled Oscillator (NCO) * \ingroup misc */ -class GR_CORE_API gr_fxpt_nco { +class /*GR_CORE_API*/ gr_fxpt_nco { gr_uint32 d_phase; gr_int32 d_phase_inc; diff --git a/gnuradio-core/src/lib/general/gr_fxpt_vco.h b/gnuradio-core/src/lib/general/gr_fxpt_vco.h index 09c649de72..13be2526bd 100644 --- a/gnuradio-core/src/lib/general/gr_fxpt_vco.h +++ b/gnuradio-core/src/lib/general/gr_fxpt_vco.h @@ -30,7 +30,7 @@ * \brief Voltage Controlled Oscillator (VCO) * \ingroup misc */ -class GR_CORE_API gr_fxpt_vco { +class /*GR_CORE_API*/ gr_fxpt_vco { gr_int32 d_phase; public: diff --git a/gr-analog/include/analog/frequency_modulator_fc.h b/gr-analog/include/analog/frequency_modulator_fc.h index b163bac94d..8706d513a6 100644 --- a/gr-analog/include/analog/frequency_modulator_fc.h +++ b/gr-analog/include/analog/frequency_modulator_fc.h @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef INCLUDED_ANALOOG_FREQUENCY_MODULATOR_FC_H -#define INCLUDED_ANALOOG_FREQUENCY_MODULATOR_FC_H +#ifndef INCLUDED_ANALOG_FREQUENCY_MODULATOR_FC_H +#define INCLUDED_ANALOG_FREQUENCY_MODULATOR_FC_H #include <analog/api.h> #include <gr_sync_block.h> diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt index 650ccf8038..7e1c174feb 100644 --- a/gr-digital/lib/CMakeLists.txt +++ b/gr-digital/lib/CMakeLists.txt @@ -156,7 +156,7 @@ list(APPEND digital_libs ) add_library(gnuradio-digital SHARED ${digital_sources}) -target_link_libraries(gnuradio-digital ${digital_libs}) +target_link_libraries(gnuradio-digital ${digital_libs} gnuradio-analog) GR_LIBRARY_FOO(gnuradio-digital RUNTIME_COMPONENT "digital_runtime" DEVEL_COMPONENT "digital_devel") add_dependencies(gnuradio-digital digital_generated_includes digital_generated_swigs |