[Commit-gnuradio] r3734 - in gnuradio/branches/developers/jcorgan/cppwrap: config gnuradio-examples gnuradio-examples/native gr-audio-alsa/src

[jcorgan]

Author: jcorgan
Date: 2006-10-06 22:06:40 -0600 (Fri, 06 Oct 2006)
New Revision: 3734

Added:
   gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/native/
   
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/native/Makefile.am
   
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/native/dialtone.cc
Modified:
   gnuradio/branches/developers/jcorgan/cppwrap/config/grc_gnuradio_examples.m4
   gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/Makefile.am
   gnuradio/branches/developers/jcorgan/cppwrap/gr-audio-alsa/src/Makefile.am
Log:
Work in progress.

Created examples area for natively compiled gnuradio examples.

Began native 'dialtone' example.  Right now just seeing what it
takes to instantiate native blocks and succesfully compile, and link.

Reorganized gr-audio-alsa build to split shared library into a
native library and a python swig library to be able to link just
against the actual block code.

Libtool complains that linking the swig module shared library against
the newly created native block library is not portable.

On Linux, this works, and make check passes.



Modified: 
gnuradio/branches/developers/jcorgan/cppwrap/config/grc_gnuradio_examples.m4
===================================================================
--- 
gnuradio/branches/developers/jcorgan/cppwrap/config/grc_gnuradio_examples.m4    
    2006-10-07 01:24:19 UTC (rev 3733)
+++ 
gnuradio/branches/developers/jcorgan/cppwrap/config/grc_gnuradio_examples.m4    
    2006-10-07 04:06:40 UTC (rev 3734)
@@ -34,7 +34,8 @@
         gnuradio-examples/python/multi-antenna/Makefile \
         gnuradio-examples/python/multi_usrp/Makefile \
         gnuradio-examples/python/networking/Makefile \
-        gnuradio-examples/python/usrp/Makefile
+        gnuradio-examples/python/usrp/Makefile \
+       gnuradio-examples/native/Makefile
     ])
 
     passed=yes

Modified: 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/Makefile.am  
2006-10-07 01:24:19 UTC (rev 3733)
+++ gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/Makefile.am  
2006-10-07 04:06:40 UTC (rev 3734)
@@ -21,4 +21,4 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = python
+SUBDIRS = python native


Property changes on: 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/native
___________________________________________________________________
Name: svn:ignore
   + .deps
.libs
Makefile
Makefile.in
dialtone


Added: 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/native/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/native/Makefile.am
                           (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/native/Makefile.am
   2006-10-07 04:06:40 UTC (rev 3734)
@@ -0,0 +1,33 @@
+#
+# Copyright 2006 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+
+include $(top_srcdir)/Makefile.common
+
+INCLUDES=$(STD_DEFINES_AND_INCLUDES)
+
+noinst_PROGRAMS = \
+    dialtone
+    
+dialtone_SOURCES = dialtone.cc
+dialtone_LDADD   = $(GNURADIO_CORE_LIBS) \
+                  $(top_builddir)/gr-audio-alsa/src/libgr_audio_alsa.la
+
+MOSTLYCLEANFILES = *~

Added: 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/native/dialtone.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/native/dialtone.cc
                           (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/native/dialtone.cc
   2006-10-07 04:06:40 UTC (rev 3734)
@@ -0,0 +1,15 @@
+#include <gnuradio/gr_sig_source_f.h>
+#include <gnuradio/audio_alsa_sink.h>
+
+int main()
+{
+    gr_sig_source_f_sptr SRC0, SRC1;
+    audio_alsa_sink_sptr SINK;
+    
+    SRC0 = gr_make_sig_source_f(48000, GR_SIN_WAVE, 350, 0.5);
+    SRC1 = gr_make_sig_source_f(48000, GR_SIN_WAVE, 440, 0.5);
+
+    SINK = audio_alsa_make_sink(48000);
+    
+    return 0;
+}


Property changes on: 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-examples/native/dialtone.cc
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: 
gnuradio/branches/developers/jcorgan/cppwrap/gr-audio-alsa/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/cppwrap/gr-audio-alsa/src/Makefile.am  
2006-10-07 01:24:19 UTC (rev 3733)
+++ gnuradio/branches/developers/jcorgan/cppwrap/gr-audio-alsa/src/Makefile.am  
2006-10-07 04:06:40 UTC (rev 3734)
@@ -55,8 +55,12 @@
 
 ourlib_LTLIBRARIES = _audio_alsa.la
 
+lib_LTLIBRARIES = libgr_audio_alsa.la
+
 _audio_alsa_la_SOURCES =               \
-       audio_alsa.cc                   \
+       audio_alsa.cc
+
+libgr_audio_alsa_la_SOURCES =          \
        audio_alsa_sink.cc              \
        audio_alsa_source.cc            \
        gri_alsa.cc                     
@@ -76,10 +80,16 @@
        $(PYTHON_LDFLAGS)               \
        $(GNURADIO_CORE_LIBS)           \
        $(ALSA_LIBS)                    \
+       libgr_audio_alsa.la             \
        -lstdc++                                
 
+libgr_audio_alsa_la_LIBADD =           \
+       $(ALSA_LIBS)
+
 _audio_alsa_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
+libgr_audio_alsa_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
+
 audio_alsa.cc audio_alsa.py: $(LOCAL_IFILES) $(NON_LOCAL_IFILES)
        $(SWIG) $(SWIGPYTHONARGS) -module audio_alsa -o audio_alsa.cc 
$(LOCAL_IFILES)