Unbreak `./configure --with-usrp1` build
Change-Id: I49b385594271ae64a48d4d39ee9fe26d7c95bd30
This commit is contained in:
parent
6e55d51747
commit
6fafd33b13
|
@ -91,12 +91,13 @@ osmo_trx_LDADD = \
|
||||||
libtransceiver.la \
|
libtransceiver.la \
|
||||||
$(ARCH_LA) \
|
$(ARCH_LA) \
|
||||||
$(GSM_LA) \
|
$(GSM_LA) \
|
||||||
$(COMMON_LA)
|
$(COMMON_LA) \
|
||||||
|
$(FFTWF_LIBS)
|
||||||
|
|
||||||
if USRP1
|
if USRP1
|
||||||
libtransceiver_la_SOURCES += USRPDevice.cpp
|
libtransceiver_la_SOURCES += USRPDevice.cpp
|
||||||
osmo_trx_LDADD += $(USRP_LIBS)
|
osmo_trx_LDADD += $(USRP_LIBS)
|
||||||
else
|
else
|
||||||
libtransceiver_la_SOURCES += UHDDevice.cpp
|
libtransceiver_la_SOURCES += UHDDevice.cpp
|
||||||
osmo_trx_LDADD += $(UHD_LIBS) $(FFTWF_LIBS)
|
osmo_trx_LDADD += $(UHD_LIBS)
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -33,6 +33,7 @@
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include "Logger.h"
|
||||||
#include "Threads.h"
|
#include "Threads.h"
|
||||||
#include "USRPDevice.h"
|
#include "USRPDevice.h"
|
||||||
|
|
||||||
|
@ -599,7 +600,7 @@ bool USRPDevice::setRxFreq(double wFreq) { return true;};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
RadioDevice *RadioDevice::make(size_t tx_sps, size_t rx_sps,
|
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);
|
return new USRPDevice(tx_sps);
|
||||||
}
|
}
|
||||||
|
|
|
@ -113,7 +113,6 @@ AS_IF([test "x$with_usrp1" != "xyes"],[
|
||||||
)]
|
)]
|
||||||
)
|
)
|
||||||
AC_DEFINE(USE_UHD, 1, All UHD versions)
|
AC_DEFINE(USE_UHD, 1, All UHD versions)
|
||||||
PKG_CHECK_MODULES(FFTWF, fftw3f)
|
|
||||||
])
|
])
|
||||||
|
|
||||||
AS_IF([test "x$with_singledb" = "xyes"], [
|
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"])
|
AM_CONDITIONAL(ARCH_ARM_A15, [test "x$with_neon_vfpv4" = "xyes"])
|
||||||
|
|
||||||
PKG_CHECK_MODULES(LIBUSB, libusb-1.0)
|
PKG_CHECK_MODULES(LIBUSB, libusb-1.0)
|
||||||
|
PKG_CHECK_MODULES(FFTWF, fftw3f)
|
||||||
|
|
||||||
AC_CHECK_HEADER([boost/config.hpp],[],
|
AC_CHECK_HEADER([boost/config.hpp],[],
|
||||||
[AC_MSG_ERROR([boost/config.hpp not found, install e.g. libboost-dev])])
|
[AC_MSG_ERROR([boost/config.hpp not found, install e.g. libboost-dev])])
|
||||||
|
|
Loading…
Reference in New Issue