From 5900d2197ea7d3c07bc665f9d8688352691d74b2 Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 10 Aug 2017 02:20:02 +0200 Subject: [PATCH] Windows build: removed LimeSDR support --- devices/devices.pro | 22 ---------------------- sdrangel.windows.pro | 3 --- windows64.install.bat | 3 --- 3 files changed, 28 deletions(-) diff --git a/devices/devices.pro b/devices/devices.pro index 650455714..4a4a47ad7 100644 --- a/devices/devices.pro +++ b/devices/devices.pro @@ -21,25 +21,12 @@ CONFIG(MINGW64):LIBBLADERFSRC = "D:\softs\bladeRF\host\libraries\libbladeRF\incl CONFIG(macx):LIBHACKRFSRC = "/opt/local/include" CONFIG(MINGW32):LIBHACKRFSRC = "D:\softs\hackrf\host" CONFIG(MINGW64):LIBHACKRFSRC = "D:\softs\hackrf\host" -CONFIG(MINGW32):LIBLIMESUITESRC = "D:\softs\LimeSuite" -CONFIG(MINGW64):LIBLIMESUITESRC = "D:\softs\LimeSuite" INCLUDEPATH += $$PWD INCLUDEPATH += ../sdrbase INCLUDEPATH += $$LIBBLADERFSRC INCLUDEPATH += $$LIBHACKRFSRC CONFIG(MINGW64)INCLUDEPATH += "D:\boost_1_58_0" -CONFIG(MINGW64)INCLUDEPATH += ../liblimesuite/srcmw -CONFIG(MINGW64)INCLUDEPATH += $$LIBLIMESUITESRC/src -CONFIG(MINGW64)INCLUDEPATH += $$LIBLIMESUITESRC/src/ADF4002 -CONFIG(MINGW64)INCLUDEPATH += $$LIBLIMESUITESRC/src/ConnectionRegistry -CONFIG(MINGW64)INCLUDEPATH += $$LIBLIMESUITESRC/src/FPGA_common -CONFIG(MINGW64)INCLUDEPATH += $$LIBLIMESUITESRC/src/GFIR -CONFIG(MINGW64)INCLUDEPATH += $$LIBLIMESUITESRC/src/lms7002m -CONFIG(MINGW64)INCLUDEPATH += $$LIBLIMESUITESRC/src/lms7002m_mcu -CONFIG(MINGW64)INCLUDEPATH += $$LIBLIMESUITESRC/src/Si5351C -CONFIG(MINGW64)INCLUDEPATH += $$LIBLIMESUITESRC/src/protocols -CONFIG(MINGW64)INCLUDEPATH += $$LIBLIMESUITESRC/external/cpp-feather-ini-parser CONFIG(Release):build_subdir = release CONFIG(Debug):build_subdir = debug @@ -52,10 +39,6 @@ SOURCES += hackrf/devicehackrf.cpp\ hackrf/devicehackrfvalues.cpp\ hackrf/devicehackrfshared.cpp -CONFIG(MINGW64)SOURCES += limesdr/devicelimesdr.cpp\ - limesdr/devicelimesdrparam.cpp\ - limesdr/devicelimesdrshared.cpp - !macx:HEADERS -= bladerf/devicebladerf.h\ bladerf/devicebladerfparam.h\ bladerf/devicebladerfvalues.h\ @@ -66,14 +49,9 @@ HEADERS += hackrf/devicehackrf.h\ hackrf/devicehackrfvalues.h\ hackrf/devicehackrfshared.h -CONFIG(MINGW64)HEADERS += limesdr/devicelimesdr.h\ - limesdr/devicelimesdrparam.h\ - limesdr/devicelimesdrshared.h - LIBS += -L../sdrbase/$${build_subdir} -lsdrbase LIBS += -L../libbladerf/$${build_subdir} -llibbladerf LIBS += -L../libhackrf/$${build_subdir} -llibhackrf -CONFIG(MINGW64)LIBS += -L../liblimesuite/$${build_subdir} -lliblimesuite macx { LIBS -= -L../libbladerf/$${build_subdir} -llibbladerf diff --git a/sdrangel.windows.pro b/sdrangel.windows.pro index 9be3372b8..2fd7b9382 100644 --- a/sdrangel.windows.pro +++ b/sdrangel.windows.pro @@ -15,7 +15,6 @@ SUBDIRS += libhackrf SUBDIRS += libairspy SUBDIRS += libbladerf CONFIG(MINGW64)SUBDIRS += libsqlite3 -CONFIG(MINGW64)SUBDIRS += liblimesuite SUBDIRS += mbelib SUBDIRS += dsdcc SUBDIRS += serialdv @@ -26,11 +25,9 @@ SUBDIRS += plugins/samplesource/rtlsdr SUBDIRS += plugins/samplesource/hackrfinput SUBDIRS += plugins/samplesource/airspy SUBDIRS += plugins/samplesource/bladerfinput -CONFIG(MINGW64)SUBDIRS += plugins/samplesource/limesdrinput SUBDIRS += plugins/samplesink/filesink SUBDIRS += plugins/samplesink/bladerfoutput SUBDIRS += plugins/samplesink/hackrfoutput -CONFIG(MINGW64)SUBDIRS += plugins/samplesink/limesdroutput SUBDIRS += plugins/channelrx/chanalyzer SUBDIRS += plugins/channelrx/chanalyzerng SUBDIRS += plugins/channelrx/demodam diff --git a/windows64.install.bat b/windows64.install.bat index 926237ed3..d5432aaca 100644 --- a/windows64.install.bat +++ b/windows64.install.bat @@ -26,7 +26,6 @@ copy librtlsdr\%1\librtlsdr.dll %2 copy libairspy\%1\libairspy.dll %2 copy libbladerf\%1\libbladerf.dll %2 copy libsqlite3\%1\libsqlite3.dll %2 -copy liblimesuite\%1\liblimesuite.dll %2 copy %libusbdir%\dll\libusb-1.0.dll %2 copy %opencvdir%\opencv_ffmpeg2413_64.dll %2 copy %opencvdir%\libopencv_imgproc2413.dll %2 @@ -60,8 +59,6 @@ copy plugins\samplesource\rtlsdr\%1\inputrtlsdr.dll %2\plugins\samplesource copy plugins\samplesource\hackrfinput\%1\inputhackrf.dll %2\plugins\samplesource copy plugins\samplesource\airspy\%1\inputairspy.dll %2\plugins\samplesource copy plugins\samplesource\bladerfinput\%1\inputbladerf.dll %2\plugins\samplesource -copy plugins\samplesource\limesdrinput\%1\inputlimesdr.dll %2\plugins\samplesource copy plugins\samplesink\filesink\%1\outputfilesink.dll %2\plugins\samplesink copy plugins\samplesink\bladerfoutput\%1\outputbladerf.dll %2\plugins\samplesink copy plugins\samplesink\hackrfoutput\%1\outputhackrf.dll %2\plugins\samplesink -copy plugins\samplesink\limesdroutput\%1\outputlimesdr.dll %2\plugins\samplesink