diff options
| -rw-r--r-- | Transceiver52M/Makefile.am | 5 | ||||
| -rw-r--r-- | Transceiver52M/USRPDevice.cpp | 3 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am index 8df2d34..5b5fafa 100644 --- a/Transceiver52M/Makefile.am +++ b/Transceiver52M/Makefile.am @@ -91,12 +91,13 @@ osmo_trx_LDADD = \ libtransceiver.la \ $(ARCH_LA) \ $(GSM_LA) \ - $(COMMON_LA) + $(COMMON_LA) \ + $(FFTWF_LIBS) if USRP1 libtransceiver_la_SOURCES += USRPDevice.cpp osmo_trx_LDADD += $(USRP_LIBS) else libtransceiver_la_SOURCES += UHDDevice.cpp -osmo_trx_LDADD += $(UHD_LIBS) $(FFTWF_LIBS) +osmo_trx_LDADD += $(UHD_LIBS) endif diff --git a/Transceiver52M/USRPDevice.cpp b/Transceiver52M/USRPDevice.cpp index 034ccd8..e5be58d 100644 --- a/Transceiver52M/USRPDevice.cpp +++ b/Transceiver52M/USRPDevice.cpp @@ -33,6 +33,7 @@ #include <stdint.h> #include <string.h> #include <stdlib.h> +#include "Logger.h" #include "Threads.h" #include "USRPDevice.h" @@ -599,7 +600,7 @@ bool USRPDevice::setRxFreq(double wFreq) { return true;}; #endif RadioDevice *RadioDevice::make(size_t tx_sps, size_t rx_sps, - size_t chans, double) + RadioDevice::InterfaceType, size_t chans, double) { return new USRPDevice(tx_sps); } diff --git a/configure.ac b/configure.ac index 5cee4a6..7d26ced 100644 --- a/configure.ac +++ b/configure.ac @@ -113,7 +113,6 @@ AS_IF([test "x$with_usrp1" != "xyes"],[ )] ) AC_DEFINE(USE_UHD, 1, All UHD versions) - PKG_CHECK_MODULES(FFTWF, fftw3f) ]) AS_IF([test "x$with_singledb" = "xyes"], [ @@ -160,6 +159,7 @@ AM_CONDITIONAL(ARCH_ARM, [test "x$with_neon" = "xyes" || test "x$with_neon_vfpv4 AM_CONDITIONAL(ARCH_ARM_A15, [test "x$with_neon_vfpv4" = "xyes"]) PKG_CHECK_MODULES(LIBUSB, libusb-1.0) +PKG_CHECK_MODULES(FFTWF, fftw3f) AC_CHECK_HEADER([boost/config.hpp],[], [AC_MSG_ERROR([boost/config.hpp not found, install e.g. libboost-dev])]) |