Correction of swig configuration - the receiver now compiles and works

This commit is contained in:
ptrkrysik 2014-09-10 06:35:02 +02:00
parent af9431b0db
commit f9834dcc4f
2 changed files with 22 additions and 28 deletions

View File

@ -17,14 +17,6 @@
# the Free Software Foundation, Inc., 51 Franklin Street, # the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA. # 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 # Include swig generation macros
######################################################################## ########################################################################

View File

@ -8,34 +8,36 @@
%include "gsm_swig_doc.i" %include "gsm_swig_doc.i"
%{ %{
#include "gsm/receiver.h" #include "gsm/receiver/receiver.h"
#include "gsm/bursts_printer.h" #include "gsm/demapping/get_bcch_or_ccch_bursts.h"
#include "gsm/get_bcch_or_ccch_bursts.h" #include "gsm/decoding/control_channels_decoder.h"
#include "gsm/control_channels_decoder.h" #include "gsm/misc_utils/bursts_printer.h"
#include "gsm/extract_system_info.h" #include "gsm/misc_utils/controlled_const_source_f.h"
#include "gsm/controlled_rotator_cc.h" #include "gsm/misc_utils/controlled_rotator_cc.h"
#include "gsm/controlled_const_source_f.h" #include "gsm/misc_utils/extract_system_info.h"
#include "gsm/message_printer.h" #include "gsm/misc_utils/message_printer.h"
#include "gsm/wireshark_sink.h" #include "gsm/misc_utils/wireshark_sink.h"
%} %}
%include "gsm/receiver.h" %include "gsm/receiver/receiver.h"
GR_SWIG_BLOCK_MAGIC2(gsm, receiver); 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" %include "gsm/decoding/control_channels_decoder.h"
GR_SWIG_BLOCK_MAGIC2(gsm, get_bcch_or_ccch_bursts);
%include "gsm/control_channels_decoder.h"
GR_SWIG_BLOCK_MAGIC2(gsm, control_channels_decoder); 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); 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); 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); 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); 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); GR_SWIG_BLOCK_MAGIC2(gsm, wireshark_sink);