diff options
| author | ptrkrysik <ptrkrysik@gmail.com> | 2014-09-10 06:35:02 +0200 |
|---|---|---|
| committer | ptrkrysik <ptrkrysik@gmail.com> | 2014-09-10 06:35:02 +0200 |
| commit | ba6f397271cc69aeb1ad84aef25717b0ae622166 (patch) | |
| tree | 1238515b84dd0448e1505aac6d12b3576d855fa8 /swig | |
| parent | 564f9c0a597f3f72164d026228d37c15152b432e (diff) | |
Correction of swig configuration - the receiver now compiles and works
Diffstat (limited to 'swig')
| -rw-r--r-- | swig/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | swig/gsm_swig.i | 42 |
2 files changed, 22 insertions, 28 deletions
diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt index 7c88fa2..68ffd63 100644 --- a/swig/CMakeLists.txt +++ b/swig/CMakeLists.txt @@ -18,14 +18,6 @@ # Boston, MA 02110-1301, USA. ######################################################################## -# Check if there is C++ code at all -######################################################################## -if(NOT lol_sources) - MESSAGE(STATUS "No C++ sources... skipping swig/") - return() -endif(NOT lol_sources) - -######################################################################## # Include swig generation macros ######################################################################## find_package(SWIG) diff --git a/swig/gsm_swig.i b/swig/gsm_swig.i index 3305e1b..939c7f2 100644 --- a/swig/gsm_swig.i +++ b/swig/gsm_swig.i @@ -8,34 +8,36 @@ %include "gsm_swig_doc.i" %{ -#include "gsm/receiver.h" -#include "gsm/bursts_printer.h" -#include "gsm/get_bcch_or_ccch_bursts.h" -#include "gsm/control_channels_decoder.h" -#include "gsm/extract_system_info.h" -#include "gsm/controlled_rotator_cc.h" -#include "gsm/controlled_const_source_f.h" -#include "gsm/message_printer.h" -#include "gsm/wireshark_sink.h" +#include "gsm/receiver/receiver.h" +#include "gsm/demapping/get_bcch_or_ccch_bursts.h" +#include "gsm/decoding/control_channels_decoder.h" +#include "gsm/misc_utils/bursts_printer.h" +#include "gsm/misc_utils/controlled_const_source_f.h" +#include "gsm/misc_utils/controlled_rotator_cc.h" +#include "gsm/misc_utils/extract_system_info.h" +#include "gsm/misc_utils/message_printer.h" +#include "gsm/misc_utils/wireshark_sink.h" %} -%include "gsm/receiver.h" +%include "gsm/receiver/receiver.h" GR_SWIG_BLOCK_MAGIC2(gsm, receiver); -%include "gsm/bursts_printer.h" -GR_SWIG_BLOCK_MAGIC2(gsm, bursts_printer); -%include "gsm/get_bcch_or_ccch_bursts.h" -GR_SWIG_BLOCK_MAGIC2(gsm, get_bcch_or_ccch_bursts); -%include "gsm/control_channels_decoder.h" +%include "gsm/decoding/control_channels_decoder.h" GR_SWIG_BLOCK_MAGIC2(gsm, control_channels_decoder); -%include "gsm/extract_system_info.h" + +%include "gsm/demapping/get_bcch_or_ccch_bursts.h" +GR_SWIG_BLOCK_MAGIC2(gsm, get_bcch_or_ccch_bursts); + +%include "gsm/misc_utils/bursts_printer.h" +GR_SWIG_BLOCK_MAGIC2(gsm, bursts_printer); +%include "gsm/misc_utils/extract_system_info.h" GR_SWIG_BLOCK_MAGIC2(gsm, extract_system_info); -%include "gsm/controlled_rotator_cc.h" +%include "gsm/misc_utils/controlled_rotator_cc.h" GR_SWIG_BLOCK_MAGIC2(gsm, controlled_rotator_cc); -%include "gsm/controlled_const_source_f.h" +%include "gsm/misc_utils/controlled_const_source_f.h" GR_SWIG_BLOCK_MAGIC2(gsm, controlled_const_source_f); -%include "gsm/message_printer.h" +%include "gsm/misc_utils/message_printer.h" GR_SWIG_BLOCK_MAGIC2(gsm, message_printer); -%include "gsm/wireshark_sink.h" +%include "gsm/misc_utils/wireshark_sink.h" GR_SWIG_BLOCK_MAGIC2(gsm, wireshark_sink); |