mirror of
https://github.com/f4exb/sdrangel.git
synced 2025-03-22 04:08:29 -04:00
Windows build: corrections and compile with latest version of LimeSuite
This commit is contained in:
f4exb
parent
0157c950f4
commit
50c977002c
@ -10,6 +10,7 @@ TEMPLATE = lib
|
||||
TARGET = liblimesuite
|
||||
|
||||
DEFINES += ENOLINK=21
|
||||
DEFINES += "__unix__"
|
||||
|
||||
QMAKE_CXXFLAGS += -fpermissive
|
||||
QMAKE_CXXFLAGS += -std=c++11
|
||||
@ -17,7 +18,7 @@ QMAKE_CXXFLAGS += -std=c++11
|
||||
CONFIG(MINGW32):LIBLIMESUITESRC = "D:\softs\LimeSuite"
|
||||
CONFIG(MINGW64):LIBLIMESUITESRC = "D:\softs\LimeSuite"
|
||||
|
||||
CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libusb-1.0.20\include"
|
||||
CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0"
|
||||
CONFIG(MINGW64):INCLUDEPATH += "D:\softs\libusb-1.0.20\include"
|
||||
|
||||
CONFIG(MINGW32):INCLUDEPATH += "..\libsqlite3\src"
|
||||
@ -34,89 +35,62 @@ INCLUDEPATH += $$LIBLIMESUITESRC/src/Si5351C
|
||||
INCLUDEPATH += $$LIBLIMESUITESRC/src/protocols
|
||||
INCLUDEPATH += $$LIBLIMESUITESRC/external/cpp-feather-ini-parser
|
||||
|
||||
SOURCES = $$LIBLIMESUITESRC/src/ADF4002/ADF4002.cpp\
|
||||
$$LIBLIMESUITESRC/src/API/lms7_api.cpp\
|
||||
$$LIBLIMESUITESRC/src/API/lms7_device.cpp\
|
||||
$$LIBLIMESUITESRC/src/API/LimeSDR_mini.cpp\
|
||||
$$LIBLIMESUITESRC/src/API/qLimeSDR.cpp\
|
||||
src/BuiltinConnections.cpp\
|
||||
SOURCES = $$LIBLIMESUITESRC/src/Logger.cpp\
|
||||
$$LIBLIMESUITESRC/src/ADF4002/ADF4002.cpp\
|
||||
$$LIBLIMESUITESRC/src/lms7002m_mcu/MCU_BD.cpp\
|
||||
$$LIBLIMESUITESRC/src/ConnectionRegistry/IConnection.cpp\
|
||||
$$LIBLIMESUITESRC/src/ConnectionRegistry/ConnectionHandle.cpp\
|
||||
$$LIBLIMESUITESRC/src/ConnectionRegistry/ConnectionRegistry.cpp\
|
||||
$$LIBLIMESUITESRC/src/ConnectionRegistry/IConnection.cpp\
|
||||
$$LIBLIMESUITESRC/src/ConnectionSTREAM/ConnectionSTREAM.cpp\
|
||||
$$LIBLIMESUITESRC/src/ConnectionSTREAM/ConnectionSTREAMImages.cpp\
|
||||
$$LIBLIMESUITESRC/src/ConnectionSTREAM/ConnectionSTREAMing.cpp\
|
||||
$$LIBLIMESUITESRC/src/ConnectionSTREAM/ConnectionSTREAMEntry.cpp\
|
||||
$$LIBLIMESUITESRC/src/Connection_uLimeSDR/Connection_uLimeSDR.cpp\
|
||||
$$LIBLIMESUITESRC/src/Connection_uLimeSDR/Connection_uLimeSDRing.cpp\
|
||||
$$LIBLIMESUITESRC/src/Connection_uLimeSDR/Connection_uLimeSDREntry.cpp\
|
||||
$$LIBLIMESUITESRC/src/ConnectionXillybus/ConnectionXillybus.cpp\
|
||||
$$LIBLIMESUITESRC/src/ConnectionXillybus/ConnectionXillybusEntry.cpp\
|
||||
$$LIBLIMESUITESRC/src/ConnectionXillybus/ConnectionXillybusing.cpp\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/LMS7002M_RegistersMap.cpp\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/LMS7002M_parameters.cpp\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/LMS7002M.cpp\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/LMS7002M_RxTxCalibrations.cpp\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/LMS7002M_BaseCalibrations.cpp\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/goert.cpp\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/mcu_dc_iq_calibration.cpp\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/CalibrationCache.cpp\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/LMS7002M_filtersCalibration.cpp\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/LMS7002M_gainCalibrations.cpp\
|
||||
$$LIBLIMESUITESRC/src/protocols/LMS64CProtocol.cpp\
|
||||
$$LIBLIMESUITESRC/src/protocols/Streamer.cpp\
|
||||
$$LIBLIMESUITESRC/src/protocols/ConnectionImages.cpp\
|
||||
$$LIBLIMESUITESRC/src/Si5351C/Si5351C.cpp\
|
||||
$$LIBLIMESUITESRC/src/kissFFT/kiss_fft.c\
|
||||
$$LIBLIMESUITESRC/src/API/lms7_api.cpp\
|
||||
$$LIBLIMESUITESRC/src/API/lms7_device.cpp\
|
||||
$$LIBLIMESUITESRC/src/API/LmsGeneric.cpp\
|
||||
$$LIBLIMESUITESRC/src/API/qLimeSDR.cpp\
|
||||
$$LIBLIMESUITESRC/src/API/LimeSDR_mini.cpp\
|
||||
$$LIBLIMESUITESRC/src/API/LimeSDR.cpp\
|
||||
$$LIBLIMESUITESRC/src/FPGA_common/FPGA_common.cpp\
|
||||
$$LIBLIMESUITESRC/src/FPGA_common/FPGA_Mini.cpp\
|
||||
$$LIBLIMESUITESRC/src/FPGA_common/FPGA_Q.cpp\
|
||||
$$LIBLIMESUITESRC/src/GFIR/corrections.c\
|
||||
$$LIBLIMESUITESRC/src/GFIR/gfir_lms.c\
|
||||
$$LIBLIMESUITESRC/src/GFIR/lms.c\
|
||||
$$LIBLIMESUITESRC/src/GFIR/recipes.c\
|
||||
$$LIBLIMESUITESRC/src/GFIR/rounding.c\
|
||||
$$LIBLIMESUITESRC/src/kissFFT/kiss_fft.c\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/CalibrationCache.cpp\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/goert.cpp\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/LMS7002M_BaseCalibrations.cpp\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/LMS7002M.cpp\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/LMS7002M_filtersCalibration.cpp\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/LMS7002M_gainCalibrations.cpp\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/LMS7002M_parameters.cpp\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/LMS7002M_RegistersMap.cpp\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/LMS7002M_RxTxCalibrations.cpp\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/mcu_dc_iq_calibration.cpp\
|
||||
$$LIBLIMESUITESRC/src/lms7002m_mcu/MCU_BD.cpp\
|
||||
$$LIBLIMESUITESRC/src/protocols/ILimeSDRStreaming.cpp\
|
||||
$$LIBLIMESUITESRC/src/protocols/LMS64CProtocol.cpp\
|
||||
$$LIBLIMESUITESRC/src/Si5351C/Si5351C.cpp\
|
||||
$$LIBLIMESUITESRC/src/ErrorReporting.cpp\
|
||||
$$LIBLIMESUITESRC/src/Logger.cpp\
|
||||
$$LIBLIMESUITESRC/src/windowFunction.cpp\
|
||||
$$LIBLIMESUITESRC/src/ConnectionFTDI/ConnectionFT601.cpp\
|
||||
$$LIBLIMESUITESRC/src/ConnectionFTDI//ConnectionFT601Entry.cpp\
|
||||
$$LIBLIMESUITESRC/src/ConnectionFX3/ConnectionFX3Entry.cpp\
|
||||
$$LIBLIMESUITESRC/src/ConnectionFX3/ConnectionFX3.cpp\
|
||||
src/BuiltinConnections.cpp\
|
||||
src/SystemResources.cpp\
|
||||
src/VersionInfo.cpp
|
||||
|
||||
HEADERS = $$LIBLIMESUITESRC/src/ADF4002/ADF4002.h\
|
||||
$$LIBLIMESUITESRC/src/API/lms7_device.h\
|
||||
$$LIBLIMESUITESRC/src/API/LimeSDR_mini.h\
|
||||
$$LIBLIMESUITESRC/src/API/qLimeSDR.h\
|
||||
$$LIBLIMESUITESRC/src/ConnectionRegistry/ConnectionHandle.h\
|
||||
$$LIBLIMESUITESRC/src/ConnectionRegistry/ConnectionRegistry.h\
|
||||
$$LIBLIMESUITESRC/src/ConnectionRegistry/IConnection.h\
|
||||
$$LIBLIMESUITESRC/src/ConnectionSTREAM/ConnectionSTREAM.h\
|
||||
$$LIBLIMESUITESRC/src/Connection_uLimeSDR/Connection_uLimeSDR.h\
|
||||
$$LIBLIMESUITESRC/src/Connection_uLimeSDR/FTD3XXLibrary/FTD3XX.h\
|
||||
$$LIBLIMESUITESRC/src/ConnectionXillybus/ConnectionXillybus.h\
|
||||
$$LIBLIMESUITESRC/src/FPGA_common/FPGA_common.h\
|
||||
$$LIBLIMESUITESRC/src/GFIR/dfilter.h\
|
||||
$$LIBLIMESUITESRC/src/GFIR/lms_gfir.h\
|
||||
$$LIBLIMESUITESRC/src/GFIR/lms.h\
|
||||
$$LIBLIMESUITESRC/src/kissFFT/_kiss_fft_guts.h\
|
||||
$$LIBLIMESUITESRC/src/kissFFT/kiss_fft.h\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/CalibrationCache.h\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/goertzel.h\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/LMS7002M.h\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/LMS7002M_parameters.h\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/LMS7002M_RegistersMap.h\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/mcu_programs.h\
|
||||
$$LIBLIMESUITESRC/src/lms7002m_mcu/MCU_BD.h\
|
||||
$$LIBLIMESUITESRC/src/lms7002m_mcu/MCU_File.h\
|
||||
$$LIBLIMESUITESRC/src/protocols/ADCUnits.h\
|
||||
$$LIBLIMESUITESRC/src/protocols/dataTypes.h\
|
||||
$$LIBLIMESUITESRC/src/protocols/fifo.h\
|
||||
$$LIBLIMESUITESRC/src/protocols/ILimeSDRStreaming.h\
|
||||
$$LIBLIMESUITESRC/src/protocols/LMS64CCommands.h\
|
||||
$$LIBLIMESUITESRC/src/protocols/LMS64CProtocol.h\
|
||||
$$LIBLIMESUITESRC/src/protocols/LMSBoards.h\
|
||||
$$LIBLIMESUITESRC/src/Si5351C/Si5351C.h\
|
||||
$$LIBLIMESUITESRC/src/ErrorReporting.h\
|
||||
$$LIBLIMESUITESRC/src/Logger.h\
|
||||
$$LIBLIMESUITESRC/src/SystemResources.h\
|
||||
$$LIBLIMESUITESRC/src/VersionInfo.h\
|
||||
$$LIBLIMESUITESRC/src/lime/LimeSuite.h
|
||||
HEADERS = $$LIBLIMESUITESRC/src/API/*.h\
|
||||
$$LIBLIMESUITESRC/src/GFIR/*.h\
|
||||
$$LIBLIMESUITESRC/src/protocols/*.h\
|
||||
$$LIBLIMESUITESRC/src/ConnectionRegistry/*.h\
|
||||
$$LIBLIMESUITESRC/src/lms7002m_mcu/*.h\
|
||||
$$LIBLIMESUITESRC/src/ADF4002/*.h\
|
||||
$$LIBLIMESUITESRC/src/Si5351C/*.h\
|
||||
$$LIBLIMESUITESRC/src/lms7002m/*.h\
|
||||
$$LIBLIMESUITESRC/src/FPGA_common/*.h\
|
||||
$$LIBLIMESUITESRC/src/lms7002m_mcu/*.h\
|
||||
$$LIBLIMESUITESRC/src/HPM7/*.h\
|
||||
$$LIBLIMESUITESRC/src/kissFFT/*.h
|
||||
|
||||
CONFIG(MINGW32):LIBS += -LD:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0
|
||||
CONFIG(MINGW64):LIBS += -LD:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0
|
||||
|
||||
@ -4,17 +4,17 @@
|
||||
**********************************************************************/
|
||||
|
||||
/* #undef ENABLE_EVB7COM */
|
||||
#define ENABLE_STREAM
|
||||
#define ENABLE_FX3
|
||||
/* #undef ENABLE_STREAM_UNITE */
|
||||
/* #undef ENABLE_NOVENARF7 */
|
||||
#define ENABLE_uLimeSDR
|
||||
#define ENABLE_PCIE_XILLYBUS
|
||||
#define ENABLE_FTDI
|
||||
/* #undef ENABLE_PCIE_XILLYBUS */
|
||||
|
||||
void __loadConnectionEVB7COMEntry(void);
|
||||
void __loadConnectionSTREAMEntry(void);
|
||||
void __loadConnectionFX3Entry(void);
|
||||
void __loadConnectionSTREAM_UNITEEntry(void);
|
||||
void __loadConnectionNovenaRF7Entry(void);
|
||||
void __loadConnection_uLimeSDREntry(void);
|
||||
void __loadConnectionFT601Entry(void);
|
||||
void __loadConnectionXillybusEntry(void);
|
||||
|
||||
void __loadAllConnections(void)
|
||||
@ -23,16 +23,16 @@ void __loadAllConnections(void)
|
||||
__loadConnectionEVB7COMEntry();
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_STREAM
|
||||
__loadConnectionSTREAMEntry();
|
||||
#ifdef ENABLE_FX3
|
||||
__loadConnectionFX3Entry();
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_STREAM_UNITE
|
||||
__loadConnectionSTREAM_UNITEEntry();
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_uLimeSDR
|
||||
__loadConnection_uLimeSDREntry();
|
||||
#ifdef ENABLE_FTDI
|
||||
__loadConnectionFT601Entry();
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_NOVENARF7
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
*/
|
||||
|
||||
#include "SystemResources.h"
|
||||
#include "ErrorReporting.h"
|
||||
#include "Logger.h"
|
||||
|
||||
#include <cstdlib> //getenv, system
|
||||
#include <vector>
|
||||
@ -23,9 +23,10 @@
|
||||
#define W_OK 4
|
||||
#endif
|
||||
|
||||
#ifdef __unix__
|
||||
#include <pwd.h>
|
||||
#ifdef __MINGW32__
|
||||
#include <unistd.h>
|
||||
#elif __unix__
|
||||
#include <pwd.h>
|
||||
#endif
|
||||
|
||||
#include <sys/types.h>
|
||||
@ -65,6 +66,7 @@ std::string lime::getLimeSuiteRoot(void)
|
||||
|
||||
std::string lime::getHomeDirectory(void)
|
||||
{
|
||||
#ifndef __MINGW32__
|
||||
//first check the HOME environment variable
|
||||
const char *userHome = std::getenv("HOME");
|
||||
if (userHome != nullptr) return userHome;
|
||||
@ -74,7 +76,7 @@ std::string lime::getHomeDirectory(void)
|
||||
const char *pwDir = getpwuid(getuid())->pw_dir;
|
||||
if (pwDir != nullptr) return pwDir;
|
||||
#endif
|
||||
|
||||
#endif
|
||||
return "";
|
||||
}
|
||||
|
||||
@ -155,7 +157,7 @@ std::string lime::locateImageResource(const std::string &name)
|
||||
{
|
||||
for (const auto &searchPath : lime::listImageSearchPaths())
|
||||
{
|
||||
const std::string fullPath(searchPath + "/17.03/" + name);
|
||||
const std::string fullPath(searchPath + "/18.02/" + name);
|
||||
if (access(fullPath.c_str(), R_OK) == 0) return fullPath;
|
||||
}
|
||||
return "";
|
||||
@ -163,9 +165,9 @@ std::string lime::locateImageResource(const std::string &name)
|
||||
|
||||
int lime::downloadImageResource(const std::string &name)
|
||||
{
|
||||
const std::string destDir(lime::getAppDataDirectory() + "/images/17.03");
|
||||
const std::string destDir(lime::getAppDataDirectory() + "/images/18.02");
|
||||
const std::string destFile(destDir + "/" + name);
|
||||
const std::string sourceUrl("http://downloads.myriadrf.org/project/limesuite/17.03/" + name);
|
||||
const std::string sourceUrl("http://downloads.myriadrf.org/project/limesuite/18.02/" + name);
|
||||
|
||||
//check if the directory already exists
|
||||
struct stat s;
|
||||
|
||||
@ -43,6 +43,7 @@ SOURCES += mainwindow.cpp\
|
||||
dsp/spectrumscopengcombovis.cpp\
|
||||
dsp/scopevis.cpp\
|
||||
dsp/scopevisng.cpp\
|
||||
dsp/scopevisxy.cpp\
|
||||
dsp/spectrumvis.cpp\
|
||||
gui/aboutdialog.cpp\
|
||||
gui/addpresetdialog.cpp\
|
||||
@ -81,6 +82,7 @@ SOURCES += mainwindow.cpp\
|
||||
gui/transverterbutton.cpp\
|
||||
gui/transverterdialog.cpp\
|
||||
gui/tickedslider.cpp\
|
||||
gui/tvscreen.cpp\
|
||||
gui/valuedial.cpp\
|
||||
gui/valuedialz.cpp\
|
||||
webapi/webapiadaptergui.cpp
|
||||
@ -93,6 +95,7 @@ HEADERS += mainwindow.h\
|
||||
dsp/spectrumscopengcombovis.h\
|
||||
dsp/scopevis.h\
|
||||
dsp/scopevisng.h\
|
||||
dsp/scopevisxy.h\
|
||||
dsp/spectrumvis.h\
|
||||
gui/aboutdialog.h\
|
||||
gui/addpresetdialog.h\
|
||||
@ -132,6 +135,7 @@ HEADERS += mainwindow.h\
|
||||
gui/tickedslider.h\
|
||||
gui/transverterbutton.h\
|
||||
gui/transverterdialog.h\
|
||||
gui/tvscreen.h\
|
||||
gui/valuedial.h\
|
||||
gui/valuedialz.h\
|
||||
webapi/webapiadaptergui.h
|
||||
|
||||
Loading…
Reference in New Issue
Block a user