diff options
Diffstat (limited to 'gr-channels/lib')
-rw-r--r-- | gr-channels/lib/CMakeLists.txt | 9 | ||||
-rw-r--r-- | gr-channels/lib/fading_model_impl.cc | 15 |
2 files changed, 4 insertions, 20 deletions
diff --git a/gr-channels/lib/CMakeLists.txt b/gr-channels/lib/CMakeLists.txt index b9ed2a4587..bd0151143d 100644 --- a/gr-channels/lib/CMakeLists.txt +++ b/gr-channels/lib/CMakeLists.txt @@ -27,8 +27,7 @@ include_directories( ${GR_BLOCKS_INCLUDE_DIRS} ${GR_FILTER_INCLUDE_DIRS} ${GR_ANALOG_INCLUDE_DIRS} - ${GNURADIO_CORE_INCLUDE_DIRS} - ${GRUEL_INCLUDE_DIRS} + ${GNURADIO_RUNTIME_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) @@ -49,7 +48,7 @@ list(APPEND channels_sources #Add Windows DLL resource file if using MSVC if(MSVC) - include(${CMAKE_INSTALL_PREFIX}/cmake/Modules/GrVersion.cmake) + include(${CMAKE_SOURCE_DIR}/cmake/Modules/GrVersion.cmake) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-channels.rc.in @@ -63,7 +62,7 @@ endif(MSVC) list(APPEND channels_libs volk - gnuradio-core + gnuradio-runtime gnuradio-filter gnuradio-analog gnuradio-blocks @@ -75,4 +74,4 @@ target_link_libraries(gnuradio-channels ${channels_libs}) GR_LIBRARY_FOO(gnuradio-channels RUNTIME_COMPONENT "channels_runtime" DEVEL_COMPONENT "channels_devel") add_dependencies(gnuradio-channels channels_generated_includes channels_generated_swigs - gnuradio-core gnuradio-filter gnuradio-analog gnuradio-blocks) + gnuradio-runtime gnuradio-filter gnuradio-analog gnuradio-blocks) diff --git a/gr-channels/lib/fading_model_impl.cc b/gr-channels/lib/fading_model_impl.cc index 080a3b8e06..ecebe4a069 100644 --- a/gr-channels/lib/fading_model_impl.cc +++ b/gr-channels/lib/fading_model_impl.cc @@ -135,21 +135,6 @@ namespace gr { pmt::mp(0), pmt::mp(1), pmt::mp(0.00001), "radians", "Maximum step size for random walk angle per sample", RPC_PRIVLVL_MIN, DISPTIME | DISPOPTSTRIP))); - - add_rpc_variable( - rpcbasic_sptr(new rpcbasic_register_get<fading_model, float >( - alias(), "step", - &fading_model::step, - pmt::mp(0), pmt::mp(8), pmt::mp(4), - "radians", "Maximum step size for random walk angle per sample", - RPC_PRIVLVL_MIN, DISPTIME | DISPOPTSTRIP))); - add_rpc_variable( - rpcbasic_sptr(new rpcbasic_register_set<fading_model, float >( - alias(), "step", - &fading_model::set_step, - pmt::mp(0), pmt::mp(1), pmt::mp(0.00001), - "radians", "Maximum step size for random walk angle per sample", - RPC_PRIVLVL_MIN, DISPTIME | DISPOPTSTRIP))); #endif /* GR_CTRLPORT */ } |