diff --git a/Readme.md b/Readme.md index f28538566..d18aaa1fa 100644 --- a/Readme.md +++ b/Readme.md @@ -89,11 +89,11 @@ To be sure you will need at least Qt version 5.5. It definitely does not work wi

Ubuntu

- - `sudo apt-get install cmake g++ pkg-config libfftw3-dev libqt5multimedia5-plugins qtmultimedia5-dev qttools5-dev qttools5-dev-tools libqt5opengl5-dev qtbase5-dev libusb-1.0 librtlsdr-dev libboost-all-dev libasound2-dev pulseaudio libopencv-dev libsqlite3-dev libxml2-dev bison flex ffmpeg libavcodec-dev libavformat-dev libopus-dev` + - `sudo apt-get install cmake g++ pkg-config libfftw3-dev libqt5multimedia5-plugins qtmultimedia5-dev qttools5-dev qttools5-dev-tools libqt5opengl5-dev qtbase5-dev libusb-1.0 librtlsdr-dev libboost-all-dev libasound2-dev pulseaudio libopencv-dev libxml2-dev bison flex ffmpeg libavcodec-dev libavformat-dev libopus-dev`

Debian

- - `sudo apt-get install cmake g++ pkg-config libfftw3-dev libusb-1.0-0-dev libusb-dev qt5-default qtbase5-dev qtchooser libqt5multimedia5-plugins qtmultimedia5-dev qttools5-dev qttools5-dev-tools libqt5opengl5-dev qtbase5-dev librtlsdr-dev libboost-all-dev libasound2-dev pulseaudio libopencv-dev libsqlite3-dev libxml2-dev bison flex ffmpeg libavcodec-dev libavformat-dev libopus-dev` + - `sudo apt-get install cmake g++ pkg-config libfftw3-dev libusb-1.0-0-dev libusb-dev qt5-default qtbase5-dev qtchooser libqt5multimedia5-plugins qtmultimedia5-dev qttools5-dev qttools5-dev-tools libqt5opengl5-dev qtbase5-dev librtlsdr-dev libboost-all-dev libasound2-dev pulseaudio libopencv-dev libxml2-dev bison flex ffmpeg libavcodec-dev libavformat-dev libopus-dev`

openSUSE

diff --git a/cmake/Modules/FindSQLite3.cmake b/cmake/Modules/FindSQLite3.cmake deleted file mode 100644 index e9f0621ab..000000000 --- a/cmake/Modules/FindSQLite3.cmake +++ /dev/null @@ -1,27 +0,0 @@ -if (NOT SQLITE3_FOUND) - find_path(SQLITE3_INCLUDE_DIRS NAMES sqlite3.h - PATHS - ${SQLITE3_PKG_INCLUDE_DIRS} - /usr/include - /usr/local/include - ) - - find_library(SQLITE3_LIBRARIES NAMES sqlite3 - PATHS - ${SQLITE3_PKG_LIBRARY_DIRS} - /usr/lib - /usr/local/lib - /usr/lib/x86_64-linux-gnu - ) - -if (SQLITE3_INCLUDE_DIRS AND SQLITE3_LIBRARIES) - set(SQLITE3_FOUND TRUE CACHE INTERNAL "sqlite3 found") - message(STATUS "Found sqlite3: ${SQLITE3_INCLUDE_DIRS}, ${SQLITE3_LIBRARIES}") -else (SQLITE3_INCLUDE_DIRS AND SQLITE3_LIBRARIES) - set(SQLITE3_FOUND FALSE CACHE INTERNAL "sqlite3 found") - message(STATUS "sqlite3 not found.") -endif (SQLITE3_INCLUDE_DIRS AND SQLITE3_LIBRARIES) - -MARK_AS_ADVANCED(SQLITE3_INCLUDE_DIRS SQLITE3_LIBRARIES) - -endif (NOT SQLITE3_FOUND) \ No newline at end of file diff --git a/liblimesuite/liblimesuite.pro b/liblimesuite/liblimesuite.pro index 6cd05f788..2ab267b6e 100644 --- a/liblimesuite/liblimesuite.pro +++ b/liblimesuite/liblimesuite.pro @@ -27,9 +27,6 @@ macx { INCLUDEPATH += "/opt/local/include/libusb-1.0" } -#CONFIG(MINGW32):INCLUDEPATH += "..\libsqlite3\src" -#CONFIG(MINGW64):INCLUDEPATH += "..\libsqlite3\src" - INCLUDEPATH += $$LIBLIMESUITESRC/src INCLUDEPATH += $$LIBLIMESUITESRC/src/lime INCLUDEPATH += $$LIBLIMESUITESRC/src/ADF4002 @@ -41,7 +38,7 @@ INCLUDEPATH += $$LIBLIMESUITESRC/src/lms7002m_mcu INCLUDEPATH += $$LIBLIMESUITESRC/src/Si5351C INCLUDEPATH += $$LIBLIMESUITESRC/src/protocols INCLUDEPATH += $$LIBLIMESUITESRC/external/cpp-feather-ini-parser - + SOURCES = $$LIBLIMESUITESRC/src/Logger.cpp\ $$LIBLIMESUITESRC/src/ADF4002/ADF4002.cpp\ $$LIBLIMESUITESRC/src/lms7002m_mcu/MCU_BD.cpp\ @@ -79,11 +76,11 @@ SOURCES = $$LIBLIMESUITESRC/src/Logger.cpp\ $$LIBLIMESUITESRC/src/ConnectionFTDI/ConnectionFT601.cpp\ $$LIBLIMESUITESRC/src/ConnectionFTDI//ConnectionFT601Entry.cpp\ $$LIBLIMESUITESRC/src/ConnectionFX3/ConnectionFX3Entry.cpp\ - $$LIBLIMESUITESRC/src/ConnectionFX3/ConnectionFX3.cpp\ + $$LIBLIMESUITESRC/src/ConnectionFX3/ConnectionFX3.cpp\ src/BuiltinConnections.cpp\ src/SystemResources.cpp\ src/VersionInfo.cpp - + HEADERS = $$LIBLIMESUITESRC/src/API/*.h\ $$LIBLIMESUITESRC/src/GFIR/*.h\ $$LIBLIMESUITESRC/src/protocols/*.h\ @@ -94,7 +91,7 @@ HEADERS = $$LIBLIMESUITESRC/src/API/*.h\ $$LIBLIMESUITESRC/src/lms7002m/*.h\ $$LIBLIMESUITESRC/src/FPGA_common/*.h\ $$LIBLIMESUITESRC/src/HPM7/*.h - + CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.21\MinGW32\dll -llibusb-1.0 CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.21\MinGW64\dll -llibusb-1.0 macx { @@ -103,9 +100,7 @@ macx { LIBS += -L/opt/install/LimeSuite/lib/ -lLimeSuite LIBS += -L/opt/local/lib -lusb-1.0 } -#CONFIG(MINGW32):LIBS += -L../libsqlite3/release -llibsqlite3 -#CONFIG(MINGW64):LIBS += -L../libsqlite3/release -llibsqlite3 CONFIG(ANDROID):CONFIG += mobility CONFIG(ANDROID):MOBILITY = - + diff --git a/plugins/samplesink/limesdroutput/readme.md b/plugins/samplesink/limesdroutput/readme.md index c9d3e7728..eecccd764 100644 --- a/plugins/samplesink/limesdroutput/readme.md +++ b/plugins/samplesink/limesdroutput/readme.md @@ -14,7 +14,6 @@ LimeSDR is a 2x2 MIMO device so it has two transmitting channels that can run co The plugin will be built only if LimeSuite is installed in your system. Please use version tagged v17.06.0 or maybe later. To build and install LimeSuite from source do: - - `sudo apt-get install libsqlite3-dev` - `git clone https://github.com/myriadrf/LimeSuite.git` - `cd LimeSuite` - `mkdir builddir` diff --git a/windows.install.bat b/windows.install.bat index 45d273f50..b235bf2dc 100644 --- a/windows.install.bat +++ b/windows.install.bat @@ -22,7 +22,6 @@ copy librtlsdr\%1\librtlsdr.dll %2 copy libairspy\%1\libairspy.dll %2 copy libairspyhf\%1\libairspyhf.dll %2 REM copy libbladerf\%1\libbladerf.dll %2 -REM copy libsqlite3\%1\libsqlite3.dll %2 copy liblimesuite\%1\liblimesuite.dll %2 copy libiio\%1\libiio.dll %2 copy %libusbdir%\dll\libusb-1.0.dll %2 diff --git a/windows64.install.bat b/windows64.install.bat index 492e2f783..dac9e9715 100644 --- a/windows64.install.bat +++ b/windows64.install.bat @@ -38,7 +38,6 @@ copy librtlsdr\%1\librtlsdr.dll %2 copy libairspy\%1\libairspy.dll %2 copy libairspyhf\%1\libairspyhf.dll %2 copy libbladerf\%1\libbladerf.dll %2 -copy libsqlite3\%1\libsqlite3.dll %2 copy liblimesuite\%1\liblimesuite.dll %2 copy libiio\%1\libiio.dll %2 copy %libusbdir%\dll\libusb-1.0.dll %2 diff --git a/windowsms.install.bat b/windowsms.install.bat index 03b330b74..655594531 100644 --- a/windowsms.install.bat +++ b/windowsms.install.bat @@ -37,7 +37,6 @@ copy %pothosdir%\bin\SoapySDR.dll %2 copy %libusbdir%\dll\libusb-1.0.dll %2 copy %pthreadsdir%\dll\x64\pthreadVC2.dll %2 -REM copy libsqlite3\%1\libsqlite3.dll %2 REM copy %libxml2dir%\bin\libxml2.dll %2 REM copy %libiconvdir%\bin\iconv.dll %2 REM copy %libzlib1dir%\bin\zlib1.dll %2