diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-02-03 15:36:58 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-02-03 15:36:58 +0100 |
| commit | a35e10870bbb9a71b3ab66b1dc58135e08c9543e (patch) | |
| tree | a9b1df0f4acc58c6615a15442495292827b8ca40 /docs/doxygen/other | |
| parent | a212beb816781416d24d1c2b7ea31265ad702f33 (diff) | |
| parent | 7365f030cdc690c00a0cd7d2dc418275495243e9 (diff) | |
Merge branch 'maint'
Diffstat (limited to 'docs/doxygen/other')
| -rw-r--r-- | docs/doxygen/other/build_guide.dox.in | 12 | ||||
| -rw-r--r-- | docs/doxygen/other/volk_guide.dox | 3 |
2 files changed, 5 insertions, 10 deletions
diff --git a/docs/doxygen/other/build_guide.dox.in b/docs/doxygen/other/build_guide.dox.in index 92ef5dad24..8169cea9fc 100644 --- a/docs/doxygen/other/build_guide.dox.in +++ b/docs/doxygen/other/build_guide.dox.in @@ -20,7 +20,7 @@ binary installation process (the <b>apt-get</b> or \b apt system in Debian and Ubuntu, <b>yum</b> or \b dnf in RedHat and Fedora, etc.). GNU Radio tries to keep an up-to-date build guide for the majority of the supported operating systems on gnuradio.org -(http://gnuradio.org/redmine/projects/gnuradio/wiki/BuildGuide). +(https://wiki.gnuradio.org/index.php/BuildGuide). Not all dependencies are required for all components, and not all components are required for a given installation. The list of required @@ -39,6 +39,7 @@ first. Most recent systems have these packages available. \li boost (>= @GR_BOOST_MIN_VERSION@) http://www.boost.org/users/download/ \li cppunit (>= @GR_CPPUNIT_MIN_VERSION@) http://freedesktop.org/wiki/Software/cppunit/ \li mako (>= @GR_MAKO_MIN_VERSION@) http://www.makotemplates.org/download.html +\li log4cpp (>= 1.0) http://log4cpp.sourceforge.net/ A C/C++ compiler is also required. These are known to work: @@ -92,16 +93,12 @@ audio-osx and audio-windows to be either satisfied or built. \subsection dep_uhd uhd: The Ettus USRP Hardware Driver Interface \li uhd (>= 3.5.5) https://www.ettus.com/downloads -\subsection dep_gr_video_sdl gr-video-sdl: PAL and NTSC display +\subsection dep_gr_video_sdl gr-video-sdl: PAL and NTSC display (rarely used) \li SDL (>= 1.2.0) http://www.libsdl.org/download-1.2.php -\subsection dep_gr_comedi gr-comedi: Comedi hardware interface +\subsection dep_gr_comedi gr-comedi: Comedi hardware interface (only if you know what this is) \li comedilib (>= 0.8.1) http://www.comedi.org/ -\subsection dep_gr_log gr-log: Logging Tools (Optional) -\li log4cpp (>= 1.0) http://log4cpp.sourceforge.net/ - - <b>Optional</b> \ref page_ctrlport may use various backends to perform the RPC @@ -112,7 +109,6 @@ Currently, ControlPort only supports the Apache Thrift backend. \li thrift (>= 0.9.2) https://thrift.apache.org/ - \section build_gr_cmake Building GNU Radio GNU Radio is built using the CMake build system diff --git a/docs/doxygen/other/volk_guide.dox b/docs/doxygen/other/volk_guide.dox index e5a55c1719..1f8f128e4b 100644 --- a/docs/doxygen/other/volk_guide.dox +++ b/docs/doxygen/other/volk_guide.dox @@ -51,8 +51,7 @@ all else fails, VOLK can fall back on the generic proto-kernel, which will always work. See <a -href="http://gnuradio.org/redmine/projects/gnuradio/wiki/Volk">VOLK on -gnuradio.org</a> for details on the VOLK naming scheme. +href="http://libvolk.org</a> for details on the VOLK naming scheme. \section volk_alignment Setting and Using Memory Alignment Information |