From 11f6b72b8cc605b18e0eba15a7a880830a812cf3 Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 12 Sep 2017 13:54:32 +0200 Subject: [PATCH] Windows build: restored mingW32 compilation --- devices/devices.pro | 1 + liblimesuite/liblimesuite.pro | 257 +++++++++--------- .../channeltx/udpsink/udpsinkudphandler.cpp | 1 + plugins/channeltx/udpsink/udpsinkudphandler.h | 1 + .../limesdroutput/limesdroutput.pro | 1 + .../limesdrinput/limesdrinput.pro | 117 ++++---- sdrbase/dsp/fftwindow.h | 3 + windows.install.bat | 2 + 8 files changed, 197 insertions(+), 186 deletions(-) diff --git a/devices/devices.pro b/devices/devices.pro index 9a93e1bb9..5e4e063f1 100644 --- a/devices/devices.pro +++ b/devices/devices.pro @@ -15,6 +15,7 @@ DEFINES += USE_SSSE3=1 QMAKE_CXXFLAGS += -mssse3 DEFINES += USE_SSE4_1=1 QMAKE_CXXFLAGS += -msse4.1 +CONFIG(MINGW32):QMAKE_CXXFLAGS += -std=c++11 CONFIG(MINGW32):LIBBLADERFSRC = "D:\softs\bladeRF\host\libraries\libbladeRF\include" CONFIG(MINGW64):LIBBLADERFSRC = "D:\softs\bladeRF\host\libraries\libbladeRF\include" diff --git a/liblimesuite/liblimesuite.pro b/liblimesuite/liblimesuite.pro index d771f0613..7f66add20 100644 --- a/liblimesuite/liblimesuite.pro +++ b/liblimesuite/liblimesuite.pro @@ -1,128 +1,129 @@ -#-------------------------------------------------------- -# -# Pro file for Android and Windows builds with Qt Creator -# -#-------------------------------------------------------- - -QT += core - -TEMPLATE = lib -TARGET = liblimesuite - -DEFINES += ENOLINK=21 - -CONFIG(MINGW32):QMAKE_CXXFLAGS += -fpermissive - -CONFIG(MINGW32):LIBLIMESUITESRC = "D:\softs\LimeSuite" -CONFIG(MINGW64):LIBLIMESUITESRC = "D:\softs\LimeSuite" - -CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libusb-1.0.20\include" -CONFIG(MINGW64):INCLUDEPATH += "D:\softs\libusb-1.0.20\include" - -CONFIG(MINGW32):INCLUDEPATH += "..\libsqlite3\src" -CONFIG(MINGW64):INCLUDEPATH += "..\libsqlite3\src" - -INCLUDEPATH += srcmw -INCLUDEPATH += $$LIBLIMESUITESRC/src -INCLUDEPATH += $$LIBLIMESUITESRC/src/ADF4002 -INCLUDEPATH += $$LIBLIMESUITESRC/src/ConnectionRegistry -INCLUDEPATH += $$LIBLIMESUITESRC/src/FPGA_common -INCLUDEPATH += $$LIBLIMESUITESRC/src/GFIR -INCLUDEPATH += $$LIBLIMESUITESRC/src/lms7002m -INCLUDEPATH += $$LIBLIMESUITESRC/src/lms7002m_mcu -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/qLimeSDR.cpp\ - src/BuiltinConnections.cpp\ - $$LIBLIMESUITESRC/src/ConnectionRegistry/ConnectionHandle.cpp\ - $$LIBLIMESUITESRC/src/ConnectionRegistry/ConnectionRegistry.cpp\ - $$LIBLIMESUITESRC/src/ConnectionRegistry/IConnection.cpp\ - srcmw/ConnectionSTREAM/ConnectionSTREAM.cpp\ - srcmw/ConnectionSTREAM/ConnectionSTREAMImages.cpp\ - srcmw/ConnectionSTREAM/ConnectionSTREAMing.cpp\ - srcmw/ConnectionSTREAM/ConnectionSTREAMEntry.cpp\ - srcmw/Connection_uLimeSDR/Connection_uLimeSDR.cpp\ - srcmw/Connection_uLimeSDR/Connection_uLimeSDRing.cpp\ - srcmw/Connection_uLimeSDR/Connection_uLimeSDREntry.cpp\ - $$LIBLIMESUITESRC/src/ConnectionXillybus/ConnectionXillybus.cpp\ - $$LIBLIMESUITESRC/src/ConnectionXillybus/ConnectionXillybusEntry.cpp\ - $$LIBLIMESUITESRC/src/ConnectionXillybus/ConnectionXillybusing.cpp\ - $$LIBLIMESUITESRC/src/FPGA_common/FPGA_common.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\ - srcmw/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\ - srcmw/lms7002m_mcu/MCU_BD.cpp\ - $$LIBLIMESUITESRC/src/protocols/ILimeSDRStreaming.cpp\ - $$LIBLIMESUITESRC/src/protocols/LMS64CProtocol.cpp\ - $$LIBLIMESUITESRC/src/Si5351C/Si5351C.cpp\ - srcmw/ErrorReporting.cpp\ - $$LIBLIMESUITESRC/src/Logger.cpp\ - src/SystemResources.cpp\ - src/VersionInfo.cpp - -HEADERS = $$LIBLIMESUITESRC/src/ADF4002/ADF4002.h\ - $$LIBLIMESUITESRC/src/API/lms7_device.h\ - $$LIBLIMESUITESRC/src/API/qLimeSDR.h\ - $$LIBLIMESUITESRC/src/ConnectionRegistry/ConnectionHandle.h\ - $$LIBLIMESUITESRC/src/ConnectionRegistry/ConnectionRegistry.h\ - $$LIBLIMESUITESRC/src/ConnectionRegistry/IConnection.h\ - srcmw/ConnectionSTREAM/ConnectionSTREAM.h\ - srcmw/Connection_uLimeSDR/Connection_uLimeSDR.h\ - $$LIBLIMESUITESRC/src/Connection_uLimeSDR/DRV_DriverInterface.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\ - srcmw/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\ - srcmw/ErrorReporting.h\ - $$LIBLIMESUITESRC/src/Logger.h\ - $$LIBLIMESUITESRC/src/SystemResources.h\ - $$LIBLIMESUITESRC/src/VersionInfo.h\ - $$LIBLIMESUITESRC/src/lime/LimeSuite.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 - -CONFIG(MINGW32):LIBS += -L../libsqlite3/release -llibsqlite3 -CONFIG(MINGW64):LIBS += -L../libsqlite3/release -llibsqlite3 - -CONFIG(ANDROID):CONFIG += mobility -CONFIG(ANDROID):MOBILITY = - +#-------------------------------------------------------- +# +# Pro file for Android and Windows builds with Qt Creator +# +#-------------------------------------------------------- + +QT += core + +TEMPLATE = lib +TARGET = liblimesuite + +DEFINES += ENOLINK=21 + +CONFIG(MINGW32):QMAKE_CXXFLAGS += -fpermissive +CONFIG(MINGW32):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(MINGW64):INCLUDEPATH += "D:\softs\libusb-1.0.20\include" + +CONFIG(MINGW32):INCLUDEPATH += "..\libsqlite3\src" +CONFIG(MINGW64):INCLUDEPATH += "..\libsqlite3\src" + +INCLUDEPATH += srcmw +INCLUDEPATH += $$LIBLIMESUITESRC/src +INCLUDEPATH += $$LIBLIMESUITESRC/src/ADF4002 +INCLUDEPATH += $$LIBLIMESUITESRC/src/ConnectionRegistry +INCLUDEPATH += $$LIBLIMESUITESRC/src/FPGA_common +INCLUDEPATH += $$LIBLIMESUITESRC/src/GFIR +INCLUDEPATH += $$LIBLIMESUITESRC/src/lms7002m +INCLUDEPATH += $$LIBLIMESUITESRC/src/lms7002m_mcu +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/qLimeSDR.cpp\ + src/BuiltinConnections.cpp\ + $$LIBLIMESUITESRC/src/ConnectionRegistry/ConnectionHandle.cpp\ + $$LIBLIMESUITESRC/src/ConnectionRegistry/ConnectionRegistry.cpp\ + $$LIBLIMESUITESRC/src/ConnectionRegistry/IConnection.cpp\ + srcmw/ConnectionSTREAM/ConnectionSTREAM.cpp\ + srcmw/ConnectionSTREAM/ConnectionSTREAMImages.cpp\ + srcmw/ConnectionSTREAM/ConnectionSTREAMing.cpp\ + srcmw/ConnectionSTREAM/ConnectionSTREAMEntry.cpp\ + srcmw/Connection_uLimeSDR/Connection_uLimeSDR.cpp\ + srcmw/Connection_uLimeSDR/Connection_uLimeSDRing.cpp\ + srcmw/Connection_uLimeSDR/Connection_uLimeSDREntry.cpp\ + $$LIBLIMESUITESRC/src/ConnectionXillybus/ConnectionXillybus.cpp\ + $$LIBLIMESUITESRC/src/ConnectionXillybus/ConnectionXillybusEntry.cpp\ + $$LIBLIMESUITESRC/src/ConnectionXillybus/ConnectionXillybusing.cpp\ + $$LIBLIMESUITESRC/src/FPGA_common/FPGA_common.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\ + srcmw/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\ + srcmw/lms7002m_mcu/MCU_BD.cpp\ + $$LIBLIMESUITESRC/src/protocols/ILimeSDRStreaming.cpp\ + $$LIBLIMESUITESRC/src/protocols/LMS64CProtocol.cpp\ + $$LIBLIMESUITESRC/src/Si5351C/Si5351C.cpp\ + srcmw/ErrorReporting.cpp\ + $$LIBLIMESUITESRC/src/Logger.cpp\ + src/SystemResources.cpp\ + src/VersionInfo.cpp + +HEADERS = $$LIBLIMESUITESRC/src/ADF4002/ADF4002.h\ + $$LIBLIMESUITESRC/src/API/lms7_device.h\ + $$LIBLIMESUITESRC/src/API/qLimeSDR.h\ + $$LIBLIMESUITESRC/src/ConnectionRegistry/ConnectionHandle.h\ + $$LIBLIMESUITESRC/src/ConnectionRegistry/ConnectionRegistry.h\ + $$LIBLIMESUITESRC/src/ConnectionRegistry/IConnection.h\ + srcmw/ConnectionSTREAM/ConnectionSTREAM.h\ + srcmw/Connection_uLimeSDR/Connection_uLimeSDR.h\ + $$LIBLIMESUITESRC/src/Connection_uLimeSDR/DRV_DriverInterface.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\ + srcmw/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\ + srcmw/ErrorReporting.h\ + $$LIBLIMESUITESRC/src/Logger.h\ + $$LIBLIMESUITESRC/src/SystemResources.h\ + $$LIBLIMESUITESRC/src/VersionInfo.h\ + $$LIBLIMESUITESRC/src/lime/LimeSuite.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 + +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/channeltx/udpsink/udpsinkudphandler.cpp b/plugins/channeltx/udpsink/udpsinkudphandler.cpp index a5279ab7e..ef84c4c24 100644 --- a/plugins/channeltx/udpsink/udpsinkudphandler.cpp +++ b/plugins/channeltx/udpsink/udpsinkudphandler.cpp @@ -15,6 +15,7 @@ /////////////////////////////////////////////////////////////////////////////////// #include +#include #include "udpsinkmsg.h" #include "udpsinkudphandler.h" diff --git a/plugins/channeltx/udpsink/udpsinkudphandler.h b/plugins/channeltx/udpsink/udpsinkudphandler.h index 9fea34d4e..52de91143 100644 --- a/plugins/channeltx/udpsink/udpsinkudphandler.h +++ b/plugins/channeltx/udpsink/udpsinkudphandler.h @@ -21,6 +21,7 @@ #include #include #include +#include #include "dsp/dsptypes.h" #include "util/message.h" diff --git a/plugins/samplesink/limesdroutput/limesdroutput.pro b/plugins/samplesink/limesdroutput/limesdroutput.pro index ea103e0b0..bcdc055b9 100644 --- a/plugins/samplesink/limesdroutput/limesdroutput.pro +++ b/plugins/samplesink/limesdroutput/limesdroutput.pro @@ -15,6 +15,7 @@ DEFINES += USE_SSE2=1 QMAKE_CXXFLAGS += -msse2 DEFINES += USE_SSE4_1=1 QMAKE_CXXFLAGS += -msse4.1 +CONFIG(MINGW32):QMAKE_CXXFLAGS += -std=c++11 CONFIG(MINGW32):LIBLIMESUITESRC = "D:\softs\LimeSuite" CONFIG(MINGW64):LIBLIMESUITESRC = "D:\softs\LimeSuite" diff --git a/plugins/samplesource/limesdrinput/limesdrinput.pro b/plugins/samplesource/limesdrinput/limesdrinput.pro index 3ebfb259b..10815807e 100644 --- a/plugins/samplesource/limesdrinput/limesdrinput.pro +++ b/plugins/samplesource/limesdrinput/limesdrinput.pro @@ -1,58 +1,59 @@ -#-------------------------------------------------------- -# -# Pro file for Android and Windows builds with Qt Creator -# -#-------------------------------------------------------- - -TEMPLATE = lib -CONFIG += plugin - -QT += core gui widgets multimedia opengl - -TARGET = inputlimesdr - -DEFINES += USE_SSE2=1 -QMAKE_CXXFLAGS += -msse2 -DEFINES += USE_SSE4_1=1 -QMAKE_CXXFLAGS += -msse4.1 - -CONFIG(MINGW32):LIBLIMESUITESRC = "D:\softs\LimeSuite" -CONFIG(MINGW64):LIBLIMESUITESRC = "D:\softs\LimeSuite" - -INCLUDEPATH += $$PWD -INCLUDEPATH += ../../../sdrbase -INCLUDEPATH += ../../../devices -INCLUDEPATH += ../../../liblimesuite/srcmw -INCLUDEPATH += $$LIBLIMESUITESRC/src -INCLUDEPATH += $$LIBLIMESUITESRC/src/ADF4002 -INCLUDEPATH += $$LIBLIMESUITESRC/src/ConnectionRegistry -INCLUDEPATH += $$LIBLIMESUITESRC/src/FPGA_common -INCLUDEPATH += $$LIBLIMESUITESRC/src/GFIR -INCLUDEPATH += $$LIBLIMESUITESRC/src/lms7002m -INCLUDEPATH += $$LIBLIMESUITESRC/src/lms7002m_mcu -INCLUDEPATH += $$LIBLIMESUITESRC/src/Si5351C -INCLUDEPATH += $$LIBLIMESUITESRC/src/protocols -INCLUDEPATH += $$LIBLIMESUITESRC/external/cpp-feather-ini-parser - -CONFIG(Release):build_subdir = release -CONFIG(Debug):build_subdir = debug - -SOURCES += limesdrinputgui.cpp\ - limesdrinput.cpp\ - limesdrinputplugin.cpp\ - limesdrinputsettings.cpp\ - limesdrinputthread.cpp - -HEADERS += limesdrinputgui.h\ - limesdrinput.h\ - limesdrinputplugin.h\ - limesdrinputsettings.h\ - limesdrinputthread.h - -FORMS += limesdrinputgui.ui - -LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase -LIBS += -L../../../liblimesuite/$${build_subdir} -lliblimesuite -LIBS += -L../../../devices/$${build_subdir} -ldevices - -RESOURCES = ../../../sdrbase/resources/res.qrc +#-------------------------------------------------------- +# +# Pro file for Android and Windows builds with Qt Creator +# +#-------------------------------------------------------- + +TEMPLATE = lib +CONFIG += plugin + +QT += core gui widgets multimedia opengl + +TARGET = inputlimesdr + +DEFINES += USE_SSE2=1 +QMAKE_CXXFLAGS += -msse2 +DEFINES += USE_SSE4_1=1 +QMAKE_CXXFLAGS += -msse4.1 +CONFIG(MINGW32):QMAKE_CXXFLAGS += -std=c++11 + +CONFIG(MINGW32):LIBLIMESUITESRC = "D:\softs\LimeSuite" +CONFIG(MINGW64):LIBLIMESUITESRC = "D:\softs\LimeSuite" + +INCLUDEPATH += $$PWD +INCLUDEPATH += ../../../sdrbase +INCLUDEPATH += ../../../devices +INCLUDEPATH += ../../../liblimesuite/srcmw +INCLUDEPATH += $$LIBLIMESUITESRC/src +INCLUDEPATH += $$LIBLIMESUITESRC/src/ADF4002 +INCLUDEPATH += $$LIBLIMESUITESRC/src/ConnectionRegistry +INCLUDEPATH += $$LIBLIMESUITESRC/src/FPGA_common +INCLUDEPATH += $$LIBLIMESUITESRC/src/GFIR +INCLUDEPATH += $$LIBLIMESUITESRC/src/lms7002m +INCLUDEPATH += $$LIBLIMESUITESRC/src/lms7002m_mcu +INCLUDEPATH += $$LIBLIMESUITESRC/src/Si5351C +INCLUDEPATH += $$LIBLIMESUITESRC/src/protocols +INCLUDEPATH += $$LIBLIMESUITESRC/external/cpp-feather-ini-parser + +CONFIG(Release):build_subdir = release +CONFIG(Debug):build_subdir = debug + +SOURCES += limesdrinputgui.cpp\ + limesdrinput.cpp\ + limesdrinputplugin.cpp\ + limesdrinputsettings.cpp\ + limesdrinputthread.cpp + +HEADERS += limesdrinputgui.h\ + limesdrinput.h\ + limesdrinputplugin.h\ + limesdrinputsettings.h\ + limesdrinputthread.h + +FORMS += limesdrinputgui.ui + +LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase +LIBS += -L../../../liblimesuite/$${build_subdir} -lliblimesuite +LIBS += -L../../../devices/$${build_subdir} -ldevices + +RESOURCES = ../../../sdrbase/resources/res.qrc diff --git a/sdrbase/dsp/fftwindow.h b/sdrbase/dsp/fftwindow.h index 89da43478..cca317810 100644 --- a/sdrbase/dsp/fftwindow.h +++ b/sdrbase/dsp/fftwindow.h @@ -24,6 +24,9 @@ #include "dsp/dsptypes.h" #include "util/export.h" +#undef M_PI +#define M_PI 3.14159265358979323846 + class SDRANGEL_API FFTWindow { public: enum Function { diff --git a/windows.install.bat b/windows.install.bat index 16518871b..635b8300c 100644 --- a/windows.install.bat +++ b/windows.install.bat @@ -14,6 +14,7 @@ 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 libiio\%1\libiio.dll %2 copy %libusbdir%\dll\libusb-1.0.dll %2 copy %opencvdir%\opencv_ffmpeg2413.dll %2 copy %opencvdir%\libopencv_imgproc2413.dll %2 @@ -48,6 +49,7 @@ 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\samplesource\plutosdrinput\%1\inputplutosdr.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