aboutsummaryrefslogtreecommitdiffstats
path: root/INSTALL
diff options
context:
space:
mode:
authorKenneth Mortensen <mortensenit@users.noreply.github.com>2015-04-22 11:39:19 +0200
committerKenneth Mortensen <mortensenit@users.noreply.github.com>2015-04-22 11:39:19 +0200
commitd45f9b924c54fc40c228b8d3709e93fed7720705 (patch)
tree1192e317e6fdfae692f67843400b698c49ee7a1f /INSTALL
parent191817b42ad86a250bbff02895e9646f51531672 (diff)
parent81775f47227c5d08a05b43ffb3855bff0a237c1d (diff)
downloaddabmod-d45f9b924c54fc40c228b8d3709e93fed7720705.tar.gz
dabmod-d45f9b924c54fc40c228b8d3709e93fed7720705.tar.bz2
dabmod-d45f9b924c54fc40c228b8d3709e93fed7720705.zip
Merge remote-tracking branch 'upstream/master'
Conflicts: src/InputFileReader.cpp
Diffstat (limited to 'INSTALL')
-rw-r--r--INSTALL7
1 files changed, 4 insertions, 3 deletions
diff --git a/INSTALL b/INSTALL
index 55385ba..bb14565 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,8 +2,8 @@ Required dependencies:
======================
* Boost 1.41 or later
+ * Optional UHD for USRP
* Optional ZeroMQ http://www.zeromq.org
- Use --disable-input-zeromq if you don't have it
* Optional FFTW 3.x (included KISS FFT is used as fallback)
Simple install procedure:
@@ -11,7 +11,7 @@ Simple install procedure:
% tar xjf odr-dabmod-X.Y.Z.tar.bz2 # Unpack the source
% cd odr-dabmod-X.Y.Z # Change to the source directory
- % ./configure --disable-debug --with-debug-malloc=yes
+ % ./configure --enable-zeromq --enable-output-uhd
# Run the configure script
% make # Build ODR-DabMod
[ as root ]
@@ -21,7 +21,8 @@ Configure options
=================
The configure script can be launch with a variety of options:
- --enable-input-zeromq Enable ZeroMQ input (to be used with ODR-DabMux)
+ --enable-zeromq Enable ZeroMQ input (to be used with ODR-DabMux),
+ output and remotecontrol.
--enable-output-uhd Includes the binding to the UHD driver for USRPs
You have the choice between two FFT libraries: KISS FFT and FFTW. KISS FFT is a