diff --git a/devices/devices.pro b/devices/devices.pro index 650455714..84f745a0e 100644 --- a/devices/devices.pro +++ b/devices/devices.pro @@ -28,18 +28,18 @@ 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 +INCLUDEPATH += "D:\boost_1_58_0" +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 @@ -52,7 +52,7 @@ SOURCES += hackrf/devicehackrf.cpp\ hackrf/devicehackrfvalues.cpp\ hackrf/devicehackrfshared.cpp -CONFIG(MINGW64)SOURCES += limesdr/devicelimesdr.cpp\ +SOURCES += limesdr/devicelimesdr.cpp\ limesdr/devicelimesdrparam.cpp\ limesdr/devicelimesdrshared.cpp @@ -66,14 +66,14 @@ HEADERS += hackrf/devicehackrf.h\ hackrf/devicehackrfvalues.h\ hackrf/devicehackrfshared.h -CONFIG(MINGW64)HEADERS += limesdr/devicelimesdr.h\ +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 +LIBS += -L../liblimesuite/$${build_subdir} -lliblimesuite macx { LIBS -= -L../libbladerf/$${build_subdir} -llibbladerf diff --git a/liblimesuite/liblimesuite.pro b/liblimesuite/liblimesuite.pro index db91fdb39..d771f0613 100644 --- a/liblimesuite/liblimesuite.pro +++ b/liblimesuite/liblimesuite.pro @@ -11,6 +11,8 @@ TARGET = liblimesuite DEFINES += ENOLINK=21 +CONFIG(MINGW32):QMAKE_CXXFLAGS += -fpermissive + CONFIG(MINGW32):LIBLIMESUITESRC = "D:\softs\LimeSuite" CONFIG(MINGW64):LIBLIMESUITESRC = "D:\softs\LimeSuite" @@ -118,8 +120,8 @@ HEADERS = $$LIBLIMESUITESRC/src/ADF4002/ADF4002.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/$${build_subdir} -llibsqlite3 -CONFIG(MINGW64):LIBS += -L../../../libsqlite3/$${build_subdir} -llibsqlite3 +CONFIG(MINGW32):LIBS += -L../libsqlite3/release -llibsqlite3 +CONFIG(MINGW64):LIBS += -L../libsqlite3/release -llibsqlite3 CONFIG(ANDROID):CONFIG += mobility CONFIG(ANDROID):MOBILITY = diff --git a/sdrangel.windows.pro b/sdrangel.windows.pro index ae2d44909..363b577cc 100644 --- a/sdrangel.windows.pro +++ b/sdrangel.windows.pro @@ -6,7 +6,6 @@ TEMPLATE = subdirs SUBDIRS = sdrbase -SUBDIRS += devices CONFIG(MINGW64)SUBDIRS += nanomsg SUBDIRS += fcdhid SUBDIRS += fcdlib @@ -14,8 +13,9 @@ SUBDIRS += librtlsdr SUBDIRS += libhackrf SUBDIRS += libairspy SUBDIRS += libbladerf -CONFIG(MINGW64)SUBDIRS += libsqlite3 -CONFIG(MINGW64)SUBDIRS += liblimesuite +SUBDIRS += libsqlite3 +SUBDIRS += liblimesuite +SUBDIRS += devices SUBDIRS += mbelib SUBDIRS += dsdcc SUBDIRS += serialdv @@ -26,11 +26,11 @@ SUBDIRS += plugins/samplesource/rtlsdr SUBDIRS += plugins/samplesource/hackrfinput SUBDIRS += plugins/samplesource/airspy SUBDIRS += plugins/samplesource/bladerfinput -CONFIG(MINGW64)SUBDIRS += plugins/samplesource/limesdrinput +SUBDIRS += plugins/samplesource/limesdrinput SUBDIRS += plugins/samplesink/filesink SUBDIRS += plugins/samplesink/bladerfoutput SUBDIRS += plugins/samplesink/hackrfoutput -CONFIG(MINGW64)SUBDIRS += plugins/samplesink/limesdroutput +SUBDIRS += plugins/samplesink/limesdroutput SUBDIRS += plugins/channelrx/chanalyzer SUBDIRS += plugins/channelrx/chanalyzerng SUBDIRS += plugins/channelrx/demodam diff --git a/windows.install.bat b/windows.install.bat index 57212e71e..ffb2ee242 100644 --- a/windows.install.bat +++ b/windows.install.bat @@ -11,6 +11,8 @@ copy libhackrf\%1\libhackrf.dll %2 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.dll %2 copy %opencvdir%\libopencv_imgproc2413.dll %2 @@ -43,6 +45,8 @@ 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