From ea83e43d09e0098a2a71e98929b1ca95239d6c4d Mon Sep 17 00:00:00 2001 From: Edouard GRIFFITHS Date: Wed, 11 Jul 2018 18:05:05 +0200 Subject: [PATCH] New Windows build --- cm256cc/cm256cc.pro | 4 ++-- devices/devices.pro | 22 +++++++++---------- dsdcc/dsdcc.pro | 14 ++++++++---- fcdhid/fcdhid.pro | 8 +++---- fcdlib/fcdlib.pro | 8 +++---- libairspy/libairspy.pro | 12 +++++----- libairspyhf/libairspyhf.pro | 12 +++++----- libbladerf/libbladerf.pro | 20 ++++++++--------- libhackrf/libhackrf.pro | 12 +++++----- libiio/libiio.pro | 20 ++++++++--------- liblimesuite/liblimesuite.pro | 20 ++++++++--------- libperseus/libperseus.pro | 12 +++++----- librtlsdr/librtlsdr.pro | 12 +++++----- mbelib/mbelib.pro | 4 ++-- nanomsg/nanomsg.pro | 4 ++-- plugins/channelrx/chanalyzer/chanalyzer.pro | 4 ++-- plugins/channelrx/demodatv/demodatv.pro | 4 ++-- plugins/channelrx/demodbfm/demodbfm.pro | 4 ++-- plugins/channelrx/demoddsd/demoddsd.pro | 12 +++++----- .../bladerfoutput/bladerfoutput.pro | 4 ++-- .../samplesink/hackrfoutput/hackrfoutput.pro | 4 ++-- .../limesdroutput/limesdroutput.pro | 4 ++-- .../plutosdroutput/plutosdroutput.pro | 4 ++-- plugins/samplesource/airspy/airspy.pro | 4 ++-- plugins/samplesource/airspyhf/airspyhf.pro | 4 ++-- .../bladerfinput/bladerfinput.pro | 4 ++-- .../samplesource/hackrfinput/hackrfinput.pro | 4 ++-- .../limesdrinput/limesdrinput.pro | 4 ++-- .../plutosdrinput/plutosdrinput.pro | 4 ++-- plugins/samplesource/rtlsdr/rtlsdr.pro | 4 ++-- sdrangel.windows.pro | 2 +- sdrbase/sdrbase.pro | 10 +++++---- sdrgui/sdrgui.pro | 4 ++-- serialdv/serialdv.pro | 4 ++-- windows.install.bat | 10 ++++----- 35 files changed, 145 insertions(+), 137 deletions(-) diff --git a/cm256cc/cm256cc.pro b/cm256cc/cm256cc.pro index bf9cb836c..26a533757 100644 --- a/cm256cc/cm256cc.pro +++ b/cm256cc/cm256cc.pro @@ -9,8 +9,8 @@ QT += core TEMPLATE = lib TARGET = cm256cc -CONFIG(MINGW32):LIBCM256CCSRC = "D:\softs\cm256cc" -CONFIG(MINGW64):LIBCM256CCSRC = "D:\softs\cm256cc" +CONFIG(MINGW32):LIBCM256CCSRC = "C:\softs\cm256cc" +CONFIG(MINGW64):LIBCM256CCSRC = "C:\softs\cm256cc" CONFIG(macx):LIBCM256CCSRC = "../../deps/cm256cc" INCLUDEPATH += $$LIBCM256CCSRC diff --git a/devices/devices.pro b/devices/devices.pro index ab4834d15..de7df266a 100644 --- a/devices/devices.pro +++ b/devices/devices.pro @@ -18,26 +18,26 @@ QMAKE_CXXFLAGS += -msse4.1 QMAKE_CXXFLAGS += -std=c++11 macx:QMAKE_LFLAGS += -F/Library/Frameworks -CONFIG(MINGW32):LIBBLADERFSRC = "D:\softs\bladeRF\host\libraries\libbladeRF\include" -CONFIG(MINGW64):LIBBLADERFSRC = "D:\softs\bladeRF\host\libraries\libbladeRF\include" +CONFIG(MINGW32):LIBBLADERFSRC = "C:\softs\bladeRF\host\libraries\libbladeRF\include" +CONFIG(MINGW64):LIBBLADERFSRC = "C:\softs\bladeRF\host\libraries\libbladeRF\include" CONFIG(macx):LIBHACKRFSRC = "/opt/local/include" -CONFIG(MINGW32):LIBHACKRFSRC = "D:\softs\hackrf\host" -CONFIG(MINGW64):LIBHACKRFSRC = "D:\softs\hackrf\host" +CONFIG(MINGW32):LIBHACKRFSRC = "C:\softs\hackrf\host" +CONFIG(MINGW64):LIBHACKRFSRC = "C:\softs\hackrf\host" CONFIG(macx):LIBLIMESUITESRC = "../../../LimeSuite-17.12.0" -CONFIG(MINGW32):LIBLIMESUITESRC = "D:\softs\LimeSuite" -CONFIG(MINGW64):LIBLIMESUITESRC = "D:\softs\LimeSuite" -CONFIG(MINGW32):LIBPERSEUSSRC = "D:\softs\libperseus-sdr" +CONFIG(MINGW32):LIBLIMESUITESRC = "C:\softs\LimeSuite" +CONFIG(MINGW64):LIBLIMESUITESRC = "C:\softs\LimeSuite" +CONFIG(MINGW32):LIBPERSEUSSRC = "C:\softs\libperseus-sdr" CONFIG(macx):LIBIIOSRC = "../../../libiio" -CONFIG(MINGW32):LIBIIOSRC = "D:\softs\libiio" -CONFIG(MINGW64):LIBIIOSRC = "D:\softs\libiio" +CONFIG(MINGW32):LIBIIOSRC = "C:\softs\libiio" +CONFIG(MINGW64):LIBIIOSRC = "C:\softs\libiio" INCLUDEPATH += $$PWD INCLUDEPATH += ../exports INCLUDEPATH += ../sdrbase INCLUDEPATH += $$LIBBLADERFSRC INCLUDEPATH += $$LIBHACKRFSRC -INCLUDEPATH += "D:\boost_1_58_0" -INCLUDEPATH += "D:\softs\libusb-1.0.20\include" +INCLUDEPATH += "C:\softs\boost_1_66_0" +INCLUDEPATH += "C:\softs\libusb-1.0.20\include" INCLUDEPATH += ../liblimesuite/srcmw INCLUDEPATH += $$LIBLIMESUITESRC/src INCLUDEPATH += $$LIBLIMESUITESRC/src/ADF4002 diff --git a/dsdcc/dsdcc.pro b/dsdcc/dsdcc.pro index e4ced1a58..7cb2add66 100644 --- a/dsdcc/dsdcc.pro +++ b/dsdcc/dsdcc.pro @@ -9,12 +9,12 @@ QT += core TEMPLATE = lib TARGET = dsdcc -CONFIG(MINGW32):LIBDSDCCSRC = "D:\softs\dsdcc" -CONFIG(MINGW64):LIBDSDCCSRC = "D:\softs\dsdcc" +CONFIG(MINGW32):LIBDSDCCSRC = "C:\softs\dsdcc" +CONFIG(MINGW64):LIBDSDCCSRC = "C:\softs\dsdcc" CONFIG(macx):LIBDSDCCSRC = "../../deps/dsdcc" -CONFIG(MINGW32):LIBMBELIBSRC = "D:\softs\mbelib" -CONFIG(MINGW64):LIBMBELIBSRC = "D:\softs\mbelib" +CONFIG(MINGW32):LIBMBELIBSRC = "C:\softs\mbelib" +CONFIG(MINGW64):LIBMBELIBSRC = "C:\softs\mbelib" CONFIG(macx):LIBMBELIBSRC = "../../deps/mbelib" INCLUDEPATH += $$LIBDSDCCSRC @@ -37,6 +37,9 @@ $$LIBDSDCCSRC/dsd_symbol.cpp\ $$LIBDSDCCSRC/dstar.cpp\ $$LIBDSDCCSRC/ysf.cpp\ $$LIBDSDCCSRC/nxdn.cpp\ +$$LIBDSDCCSRC/nxdnconvolution.cpp\ +$$LIBDSDCCSRC/nxdncrc.cpp\ +$$LIBDSDCCSRC/nxdnmessage.cpp\ $$LIBDSDCCSRC/dpmr.cpp\ $$LIBDSDCCSRC/p25p1_heuristics.cpp\ $$LIBDSDCCSRC/fec.cpp\ @@ -62,6 +65,9 @@ $$LIBDSDCCSRC/dsd_symbol.h\ $$LIBDSDCCSRC/dstar.h\ $$LIBDSDCCSRC/ysf.h\ $$LIBDSDCCSRC/nxdn.h\ +$$LIBDSDCCSRC/nxdnconvolution.h\ +$$LIBDSDCCSRC/nxdncrc.h\ +$$LIBDSDCCSRC/nxdnmessage.h\ $$LIBDSDCCSRC/dpmr.h\ $$LIBDSDCCSRC/p25p1_heuristics.h\ $$LIBDSDCCSRC/runningmaxmin.h\ diff --git a/fcdhid/fcdhid.pro b/fcdhid/fcdhid.pro index 3b37e19bc..ecf5eb64a 100644 --- a/fcdhid/fcdhid.pro +++ b/fcdhid/fcdhid.pro @@ -9,10 +9,10 @@ QT += core TEMPLATE = lib TARGET = fcdhid -CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libusb-1.0.20\include" +CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.20\include" CONFIG(MINGW32):DEFINES += MINGW32=1 -CONFIG(MINGW64):INCLUDEPATH += "D:\softs\libusb-1.0.20\include" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.20\include" CONFIG(MINGW64):DEFINES += MINGW32=1 CONFIG(macx):INCLUDEPATH += "/opt/local/include" @@ -26,6 +26,6 @@ HEADERS = $$PWD/fcdhid.h\ $$PWD/hid-libusb.h\ $$PWD/hidapi.h -CONFIG(MINGW32):LIBS += -LD:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0 -liconv -CONFIG(MINGW64):LIBS += -LD:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0 -liconv +CONFIG(MINGW32):LIBS += -LC:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0 -liconv +CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0 -liconv CONFIG(macx):LIBS += -L/opt/local/lib -lusb-1.0 -liconv diff --git a/fcdlib/fcdlib.pro b/fcdlib/fcdlib.pro index f6bf6c8b7..949f78d5c 100644 --- a/fcdlib/fcdlib.pro +++ b/fcdlib/fcdlib.pro @@ -9,8 +9,8 @@ QT += core TEMPLATE = lib TARGET = fcdlib -CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libusb-1.0.20\include" -CONFIG(MINGW64):INCLUDEPATH += "D:\softs\libusb-1.0.20\include" +CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.20\include" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.20\include" SOURCES = $$PWD/fcdtraits.cpp\ $$PWD/fcdproplusconst.cpp\ @@ -20,5 +20,5 @@ HEADERS = $$PWD/fcdtraits.h\ $$PWD/fcdproplusconst.h\ $$PWD/fcdproconst.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 += -LC:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0 +CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0 diff --git a/libairspy/libairspy.pro b/libairspy/libairspy.pro index aa5031906..5506a510e 100644 --- a/libairspy/libairspy.pro +++ b/libairspy/libairspy.pro @@ -9,12 +9,12 @@ QT += core TEMPLATE = lib TARGET = libairspy -CONFIG(MINGW32):LIBAIRSPYSRC = "D:\softs\libairspy\libairspy" -CONFIG(MINGW64):LIBAIRSPYSRC = "D:\softs\libairspy\libairspy" +CONFIG(MINGW32):LIBAIRSPYSRC = "C:\softs\libairspy\libairspy" +CONFIG(MINGW64):LIBAIRSPYSRC = "C:\softs\libairspy\libairspy" INCLUDEPATH += $$LIBAIRSPYSRC/src -CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0" -CONFIG(MINGW64):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0" +CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.20\include\libusb-1.0" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.20\include\libusb-1.0" SOURCES = $$LIBAIRSPYSRC/src/airspy.c\ $$LIBAIRSPYSRC/src/iqconverter_float.c\ @@ -26,8 +26,8 @@ HEADERS = $$LIBAIRSPYSRC/src/airspy.h\ $$LIBAIRSPYSRC/src/iqconverter_int16.h\ $$LIBAIRSPYSRC/src/filters.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 += -LC:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0 +CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0 CONFIG(ANDROID):CONFIG += mobility CONFIG(ANDROID):MOBILITY = diff --git a/libairspyhf/libairspyhf.pro b/libairspyhf/libairspyhf.pro index 0c9efeae6..9639c7900 100644 --- a/libairspyhf/libairspyhf.pro +++ b/libairspyhf/libairspyhf.pro @@ -9,12 +9,12 @@ QT += core TEMPLATE = lib TARGET = libairspyhf -CONFIG(MINGW32):LIBAIRSPYHFSRC = "D:\softs\airspyhf\libairspyhf" -CONFIG(MINGW64):LIBAIRSPYHFSRC = "D:\softs\airspyhf\libairspyhf" +CONFIG(MINGW32):LIBAIRSPYHFSRC = "C:\softs\airspyhf\libairspyhf" +CONFIG(MINGW64):LIBAIRSPYHFSRC = "C:\softs\airspyhf\libairspyhf" INCLUDEPATH += $$LIBAIRSPYHFSRC/src -CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0" -CONFIG(MINGW64):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0" +CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.20\include\libusb-1.0" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.20\include\libusb-1.0" SOURCES = $$LIBAIRSPYHFSRC/src/airspyhf.c\ $$LIBAIRSPYHFSRC/src/iqbalancer.c @@ -23,8 +23,8 @@ HEADERS = $$LIBAIRSPYHFSRC/src/airspyhf.h\ $$LIBAIRSPYHFSRC/src/airspyhf_commands.h\ $$LIBAIRSPYHFSRC/src/iqbalancer.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 += -LC:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0 +CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0 CONFIG(ANDROID):CONFIG += mobility CONFIG(ANDROID):MOBILITY = diff --git a/libbladerf/libbladerf.pro b/libbladerf/libbladerf.pro index 610a9c797..4919c084f 100644 --- a/libbladerf/libbladerf.pro +++ b/libbladerf/libbladerf.pro @@ -11,12 +11,12 @@ TARGET = libbladerf DEFINES += BLADERF_OS_WINDOWS=1 -CONFIG(MINGW32):LIBBLADERFSRC = "D:\softs\bladeRF" -CONFIG(MINGW32):LIBBLADERFCOMMONSRC = "D:\softs\bladeRF\host\common" -CONFIG(MINGW32):LIBBLADERFLIBSRC = "D:\softs\bladeRF\host\libraries\libbladeRF" -CONFIG(MINGW64):LIBBLADERFSRC = "D:\softs\bladeRF" -CONFIG(MINGW64):LIBBLADERFCOMMONSRC = "D:\softs\bladeRF\host\common" -CONFIG(MINGW64):LIBBLADERFLIBSRC = "D:\softs\bladeRF\host\libraries\libbladeRF" +CONFIG(MINGW32):LIBBLADERFSRC = "C:\softs\bladeRF" +CONFIG(MINGW32):LIBBLADERFCOMMONSRC = "C:\softs\bladeRF\host\common" +CONFIG(MINGW32):LIBBLADERFLIBSRC = "C:\softs\bladeRF\host\libraries\libbladeRF" +CONFIG(MINGW64):LIBBLADERFSRC = "C:\softs\bladeRF" +CONFIG(MINGW64):LIBBLADERFCOMMONSRC = "C:\softs\bladeRF\host\common" +CONFIG(MINGW64):LIBBLADERFLIBSRC = "C:\softs\bladeRF\host\libraries\libbladeRF" INCLUDEPATH += $$LIBBLADERFLIBSRC/include INCLUDEPATH += $$LIBBLADERFLIBSRC/src INCLUDEPATH += $$LIBBLADERFSRC/firmware_common @@ -25,8 +25,8 @@ INCLUDEPATH += $$LIBBLADERFCOMMONSRC/include INCLUDEPATH += $$LIBBLADERFCOMMONSRC/include/windows INCLUDEPATH += $$PWD/include -CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0" -CONFIG(MINGW64):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0" +CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.20\include\libusb-1.0" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.20\include\libusb-1.0" SOURCES = $$LIBBLADERFLIBSRC/src/async.c\ $$LIBBLADERFLIBSRC/src/bladerf_priv.c\ @@ -102,8 +102,8 @@ HEADERS = $$LIBBLADERFLIBSRC/src/async.h\ $$PWD/include/backend/backend_config.h\ $$PWD/include/version.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 += -LC:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0 +CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0 CONFIG(ANDROID):CONFIG += mobility CONFIG(ANDROID):MOBILITY = diff --git a/libhackrf/libhackrf.pro b/libhackrf/libhackrf.pro index 5f92e0285..31bf07ada 100644 --- a/libhackrf/libhackrf.pro +++ b/libhackrf/libhackrf.pro @@ -9,19 +9,19 @@ QT += core TEMPLATE = lib TARGET = libhackrf -CONFIG(MINGW32):LIBHACKRFSRC = "D:\softs\hackrf\host\libhackrf" -CONFIG(MINGW64):LIBHACKRFSRC = "D:\softs\hackrf\host\libhackrf" +CONFIG(MINGW32):LIBHACKRFSRC = "C:\softs\hackrf\host\libhackrf" +CONFIG(MINGW64):LIBHACKRFSRC = "C:\softs\hackrf\host\libhackrf" INCLUDEPATH += $$LIBHACKRFSRC/src -CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0" -CONFIG(MINGW64):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0" +CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.20\include\libusb-1.0" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.20\include\libusb-1.0" SOURCES = $$LIBHACKRFSRC/src/hackrf.c HEADERS = $$LIBHACKRFSRC/src/hackrf.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 += -LC:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0 +CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0 CONFIG(ANDROID):CONFIG += mobility CONFIG(ANDROID):MOBILITY = diff --git a/libiio/libiio.pro b/libiio/libiio.pro index d02e40b64..4ea08c18a 100644 --- a/libiio/libiio.pro +++ b/libiio/libiio.pro @@ -9,23 +9,23 @@ QT += core TEMPLATE = lib TARGET = libiio -CONFIG(MINGW32):LIBIIOSRC = "D:\softs\libiio" -CONFIG(MINGW64):LIBIIOSRC = "D:\softs\libiio" +CONFIG(MINGW32):LIBIIOSRC = "C:\softs\libiio" +CONFIG(MINGW64):LIBIIOSRC = "C:\softs\libiio" DEFINES += LIBIIO_EXPORTS=1 INCLUDEPATH += $$PWD/includemw INCLUDEPATH += $$LIBIIOSRC -CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libusb-1.0.20\include" -CONFIG(MINGW64):INCLUDEPATH += "D:\softs\libusb-1.0.20\include" +CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.20\include" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.20\include" # LibXml2 Windows distribution from: # http://xmlsoft.org/sources/win32/ # http://xmlsoft.org/sources/win32/64bit/ -CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libxml2-2.7.8.win32\include" -CONFIG(MINGW64):INCLUDEPATH += "D:\softs\libxml2-2.9.3-win32-x86_64\include\libxml2" +CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libxml2-2.7.8.win32\include" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libxml2-2.9.3-win32-x86_64\include\libxml2" SOURCES = $$LIBIIOSRC/backend.c\ $$LIBIIOSRC/buffer.c\ @@ -49,11 +49,11 @@ HEADERS = $$LIBIIOSRC/debug.h\ $$LIBIIOSRC/iio-private.h\ $$PWD/includemw/iio-config.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 += -LC:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0 +CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0 -CONFIG(MINGW32):LIBS += -LD:\softs\libxml2-2.7.8.win32\bin -llibxml2 -CONFIG(MINGW64):LIBS += -LD:\softs\libxml2-2.9.3-win32-x86_64\bin -llibxml2-2 +CONFIG(MINGW32):LIBS += -LC:\softs\libxml2-2.7.8.win32\bin -llibxml2 +CONFIG(MINGW64):LIBS += -LC:\softs\libxml2-2.9.3-win32-x86_64\bin -llibxml2-2 CONFIG(ANDROID):CONFIG += mobility CONFIG(ANDROID):MOBILITY = diff --git a/liblimesuite/liblimesuite.pro b/liblimesuite/liblimesuite.pro index a810c3336..ccd696bd1 100644 --- a/liblimesuite/liblimesuite.pro +++ b/liblimesuite/liblimesuite.pro @@ -15,14 +15,14 @@ DEFINES += "__unix__" QMAKE_CXXFLAGS += -fpermissive QMAKE_CXXFLAGS += -std=c++11 -CONFIG(MINGW32):LIBLIMESUITESRC = "D:\softs\LimeSuite" -CONFIG(MINGW64):LIBLIMESUITESRC = "D:\softs\LimeSuite" +CONFIG(MINGW32):LIBLIMESUITESRC = "C:\softs\LimeSuite" +CONFIG(MINGW64):LIBLIMESUITESRC = "C:\softs\LimeSuite" -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 += "C:\softs\libusb-1.0.20\include\libusb-1.0" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.20\include" -CONFIG(MINGW32):INCLUDEPATH += "..\libsqlite3\src" -CONFIG(MINGW64):INCLUDEPATH += "..\libsqlite3\src" +#CONFIG(MINGW32):INCLUDEPATH += "..\libsqlite3\src" +#CONFIG(MINGW64):INCLUDEPATH += "..\libsqlite3\src" INCLUDEPATH += $$LIBLIMESUITESRC/src INCLUDEPATH += $$LIBLIMESUITESRC/src/ADF4002 @@ -88,11 +88,11 @@ HEADERS = $$LIBLIMESUITESRC/src/API/*.h\ $$LIBLIMESUITESRC/src/FPGA_common/*.h\ $$LIBLIMESUITESRC/src/HPM7/*.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 += -LC:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0 +CONFIG(MINGW64):LIBS += -LC:\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(MINGW32):LIBS += -L../libsqlite3/release -llibsqlite3 +#CONFIG(MINGW64):LIBS += -L../libsqlite3/release -llibsqlite3 CONFIG(ANDROID):CONFIG += mobility CONFIG(ANDROID):MOBILITY = diff --git a/libperseus/libperseus.pro b/libperseus/libperseus.pro index e3cf9c2b3..ba418e6df 100644 --- a/libperseus/libperseus.pro +++ b/libperseus/libperseus.pro @@ -11,12 +11,12 @@ TARGET = libperseus DEFINES += HAVE_CONFIG_H=1 -CONFIG(MINGW32):LIBPERSEUSSRC = "D:\softs\libperseus-sdr" -CONFIG(MINGW64):LIBPERSEUSSRC = "D:\softs\libperseus-sdr" +CONFIG(MINGW32):LIBPERSEUSSRC = "C:\softs\libperseus-sdr" +CONFIG(MINGW64):LIBPERSEUSSRC = "C:\softs\libperseus-sdr" INCLUDEPATH += $$LIBPERSEUSSRC/src -CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libusb-1.0.20\include" -CONFIG(MINGW64):INCLUDEPATH += "D:\softs\libusb-1.0.20\include" +CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.20\include" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.20\include" SOURCES = fpga_data.c\ $$LIBPERSEUSSRC/fifo.c\ @@ -34,8 +34,8 @@ HEADERS = fpga_data.h\ $$LIBPERSEUSSRC/perseus-in.h\ $$LIBPERSEUSSRC/perseus-sdr.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 += -LC:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0 +CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0 CONFIG(ANDROID):CONFIG += mobility CONFIG(ANDROID):MOBILITY = diff --git a/librtlsdr/librtlsdr.pro b/librtlsdr/librtlsdr.pro index 8568dd11e..4f5fa1e48 100644 --- a/librtlsdr/librtlsdr.pro +++ b/librtlsdr/librtlsdr.pro @@ -9,12 +9,12 @@ QT += core TEMPLATE = lib TARGET = librtlsdr -CONFIG(MINGW32):LIBRTLSDRSRC = "D:\softs\librtlsdr" -CONFIG(MINGW64):LIBRTLSDRSRC = "D:\softs\librtlsdr" +CONFIG(MINGW32):LIBRTLSDRSRC = "C:\softs\librtlsdr" +CONFIG(MINGW64):LIBRTLSDRSRC = "C:\softs\librtlsdr" INCLUDEPATH += $$LIBRTLSDRSRC/include -CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0" -CONFIG(MINGW64):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0" +CONFIG(MINGW32):INCLUDEPATH += "C:\softs\libusb-1.0.20\include\libusb-1.0" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\libusb-1.0.20\include\libusb-1.0" SOURCES = $$LIBRTLSDRSRC/src/librtlsdr.c\ $$LIBRTLSDRSRC/src/tuner_e4k.c\ @@ -37,8 +37,8 @@ HEADERS = $$LIBRTLSDRSRC/include/reg_field.h\ $$LIBRTLSDRSRC/src/getopt/getopt.h\ $$LIBRTLSDRSRC/src/convenience/convenience.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 += -LC:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0 +CONFIG(MINGW64):LIBS += -LC:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0 CONFIG(ANDROID):CONFIG += mobility CONFIG(ANDROID):MOBILITY = diff --git a/mbelib/mbelib.pro b/mbelib/mbelib.pro index d4063254b..1714145f5 100644 --- a/mbelib/mbelib.pro +++ b/mbelib/mbelib.pro @@ -9,8 +9,8 @@ QT += core TEMPLATE = lib TARGET = mbelib -CONFIG(MINGW32):LIBMBELIBSRC = "D:\softs\mbelib" -CONFIG(MINGW64):LIBMBELIBSRC = "D:\softs\mbelib" +CONFIG(MINGW32):LIBMBELIBSRC = "C:\softs\mbelib" +CONFIG(MINGW64):LIBMBELIBSRC = "C:\softs\mbelib" CONFIG(macx):LIBMBELIBSRC = "../../deps/mbelib" INCLUDEPATH += $$LIBMBELIBSRC diff --git a/nanomsg/nanomsg.pro b/nanomsg/nanomsg.pro index c291592fd..efcc924bc 100644 --- a/nanomsg/nanomsg.pro +++ b/nanomsg/nanomsg.pro @@ -9,8 +9,8 @@ QT += core TEMPLATE = lib TARGET = nanomsg -CONFIG(MINGW32):LIBNANOMSGSRC = "D:\softs\nanomsg-0.8-beta" -CONFIG(MINGW64):LIBNANOMSGSRC = "D:\softs\nanomsg-0.8-beta" +CONFIG(MINGW32):LIBNANOMSGSRC = "C:\softs\nanomsg-0.8-beta" +CONFIG(MINGW64):LIBNANOMSGSRC = "C:\softs\nanomsg-0.8-beta" CONFIG(MINGW32):DEFINES += NN_HAVE_WINDOWS=1 CONFIG(MINGW32):DEFINES += _CRT_SECURE_NO_WARNINGS=1 diff --git a/plugins/channelrx/chanalyzer/chanalyzer.pro b/plugins/channelrx/chanalyzer/chanalyzer.pro index 2731e8062..e2209802a 100644 --- a/plugins/channelrx/chanalyzer/chanalyzer.pro +++ b/plugins/channelrx/chanalyzer/chanalyzer.pro @@ -23,8 +23,8 @@ INCLUDEPATH += ../../../sdrbase INCLUDEPATH += ../../../sdrgui CONFIG(ANDROID):INCLUDEPATH += /opt/softs/boost_1_60_0 -CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_58_0" -CONFIG(MINGW64):INCLUDEPATH += "D:\boost_1_58_0" +CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_64_0" CONFIG(Release):build_subdir = release diff --git a/plugins/channelrx/demodatv/demodatv.pro b/plugins/channelrx/demodatv/demodatv.pro index 1b7811c02..decef5410 100644 --- a/plugins/channelrx/demodatv/demodatv.pro +++ b/plugins/channelrx/demodatv/demodatv.pro @@ -25,8 +25,8 @@ INCLUDEPATH += ../../../sdrgui CONFIG(Release):build_subdir = release CONFIG(Debug):build_subdir = debug -CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_58_0" -CONFIG(MINGW64):INCLUDEPATH += "D:\boost_1_58_0" +CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_64_0" SOURCES += atvdemod.cpp\ diff --git a/plugins/channelrx/demodbfm/demodbfm.pro b/plugins/channelrx/demodbfm/demodbfm.pro index 7bcca3657..8f7d6bea1 100644 --- a/plugins/channelrx/demodbfm/demodbfm.pro +++ b/plugins/channelrx/demodbfm/demodbfm.pro @@ -24,8 +24,8 @@ INCLUDEPATH += ../../../sdrgui INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client CONFIG(ANDROID):INCLUDEPATH += /opt/softs/boost_1_60_0 -CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_58_0" -CONFIG(MINGW64):INCLUDEPATH += "D:\boost_1_58_0" +CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_64_0" CONFIG(Release):build_subdir = release diff --git a/plugins/channelrx/demoddsd/demoddsd.pro b/plugins/channelrx/demoddsd/demoddsd.pro index 8ea93c839..8b8c96bc7 100644 --- a/plugins/channelrx/demoddsd/demoddsd.pro +++ b/plugins/channelrx/demoddsd/demoddsd.pro @@ -17,16 +17,16 @@ DEFINES += USE_SSE4_1=1 QMAKE_CXXFLAGS += -msse4.1 QMAKE_CXXFLAGS += -std=c++11 -CONFIG(MINGW32):LIBDSDCCSRC = "D:\softs\dsdcc" -CONFIG(MINGW64):LIBDSDCCSRC = "D:\softs\dsdcc" +CONFIG(MINGW32):LIBDSDCCSRC = "C:\softs\dsdcc" +CONFIG(MINGW64):LIBDSDCCSRC = "C:\softs\dsdcc" CONFIG(macx):LIBDSDCCSRC = "../../../../deps/dsdcc" -CONFIG(MINGW32):LIBMBELIBSRC = "D:\softs\mbelib" -CONFIG(MINGW64):LIBMBELIBSRC = "D:\softs\mbelib" +CONFIG(MINGW32):LIBMBELIBSRC = "C:\softs\mbelib" +CONFIG(MINGW64):LIBMBELIBSRC = "C:\softs\mbelib" CONFIG(macx):LIBMBELIBSRC = "../../../../deps/mbelib" -CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_58_0" -CONFIG(MINGW64):INCLUDEPATH += "D:\boost_1_58_0" +CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_64_0" INCLUDEPATH += $$PWD diff --git a/plugins/samplesink/bladerfoutput/bladerfoutput.pro b/plugins/samplesink/bladerfoutput/bladerfoutput.pro index b670583c8..9664b2eb4 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutput.pro +++ b/plugins/samplesink/bladerfoutput/bladerfoutput.pro @@ -17,8 +17,8 @@ DEFINES += USE_SSE4_1=1 QMAKE_CXXFLAGS += -msse4.1 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" +CONFIG(MINGW32):LIBBLADERFSRC = "C:\softs\bladeRF\host\libraries\libbladeRF\include" +CONFIG(MINGW64):LIBBLADERFSRC = "C:\softs\bladeRF\host\libraries\libbladeRF\include" INCLUDEPATH += $$PWD INCLUDEPATH += ../../../exports INCLUDEPATH += ../../../sdrbase diff --git a/plugins/samplesink/hackrfoutput/hackrfoutput.pro b/plugins/samplesink/hackrfoutput/hackrfoutput.pro index 05c256d4d..3fe253caf 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutput.pro +++ b/plugins/samplesink/hackrfoutput/hackrfoutput.pro @@ -17,8 +17,8 @@ DEFINES += USE_SSE4_1=1 QMAKE_CXXFLAGS += -msse4.1 QMAKE_CXXFLAGS += -std=c++11 -CONFIG(MINGW32):LIBHACKRFSRC = "D:\softs\hackrf\host" -CONFIG(MINGW64):LIBHACKRFSRC = "D:\softs\hackrf\host" +CONFIG(MINGW32):LIBHACKRFSRC = "C:\softs\hackrf\host" +CONFIG(MINGW64):LIBHACKRFSRC = "C:\softs\hackrf\host" INCLUDEPATH += $$PWD INCLUDEPATH += ../../../exports INCLUDEPATH += ../../../sdrbase diff --git a/plugins/samplesink/limesdroutput/limesdroutput.pro b/plugins/samplesink/limesdroutput/limesdroutput.pro index 51efed10b..e296a3e6c 100644 --- a/plugins/samplesink/limesdroutput/limesdroutput.pro +++ b/plugins/samplesink/limesdroutput/limesdroutput.pro @@ -17,8 +17,8 @@ DEFINES += USE_SSE4_1=1 QMAKE_CXXFLAGS += -msse4.1 QMAKE_CXXFLAGS += -std=c++11 -CONFIG(MINGW32):LIBLIMESUITESRC = "D:\softs\LimeSuite" -CONFIG(MINGW64):LIBLIMESUITESRC = "D:\softs\LimeSuite" +CONFIG(MINGW32):LIBLIMESUITESRC = "C:\softs\LimeSuite" +CONFIG(MINGW64):LIBLIMESUITESRC = "C:\softs\LimeSuite" INCLUDEPATH += $$PWD INCLUDEPATH += ../../../exports diff --git a/plugins/samplesink/plutosdroutput/plutosdroutput.pro b/plugins/samplesink/plutosdroutput/plutosdroutput.pro index f788ba60d..2d1fd03e4 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutput.pro +++ b/plugins/samplesink/plutosdroutput/plutosdroutput.pro @@ -17,8 +17,8 @@ DEFINES += USE_SSE4_1=1 QMAKE_CXXFLAGS += -msse4.1 QMAKE_CXXFLAGS += -std=c++11 -CONFIG(MINGW32):LIBIIOSRC = "D:\softs\libiio" -CONFIG(MINGW64):LIBIIOSRC = "D:\softs\libiio" +CONFIG(MINGW32):LIBIIOSRC = "C:\softs\libiio" +CONFIG(MINGW64):LIBIIOSRC = "C:\softs\libiio" INCLUDEPATH += $$PWD INCLUDEPATH += ../../../exports diff --git a/plugins/samplesource/airspy/airspy.pro b/plugins/samplesource/airspy/airspy.pro index 9f3083501..5ba6d7050 100644 --- a/plugins/samplesource/airspy/airspy.pro +++ b/plugins/samplesource/airspy/airspy.pro @@ -11,8 +11,8 @@ QT += core gui widgets multimedia opengl TARGET = inputairspy -CONFIG(MINGW32):LIBAIRSPYSRC = "D:\softs\libairspy" -CONFIG(MINGW64):LIBAIRSPYSRC = "D:\softs\libairspy" +CONFIG(MINGW32):LIBAIRSPYSRC = "C:\softs\libairspy" +CONFIG(MINGW64):LIBAIRSPYSRC = "C:\softs\libairspy" INCLUDEPATH += $$PWD INCLUDEPATH += ../../../exports INCLUDEPATH += ../../../sdrbase diff --git a/plugins/samplesource/airspyhf/airspyhf.pro b/plugins/samplesource/airspyhf/airspyhf.pro index 70ec7bdea..6f95b2485 100644 --- a/plugins/samplesource/airspyhf/airspyhf.pro +++ b/plugins/samplesource/airspyhf/airspyhf.pro @@ -11,8 +11,8 @@ QT += core gui widgets multimedia opengl TARGET = inputairspyhf -CONFIG(MINGW32):LIBAIRSPYHFSRC = "D:\softs\airspyhf" -CONFIG(MINGW64):LIBAIRSPYHFSRC = "D:\softs\airspyhf" +CONFIG(MINGW32):LIBAIRSPYHFSRC = "C:\softs\airspyhf" +CONFIG(MINGW64):LIBAIRSPYHFSRC = "C:\softs\airspyhf" INCLUDEPATH += $$PWD INCLUDEPATH += ../../../exports INCLUDEPATH += ../../../sdrbase diff --git a/plugins/samplesource/bladerfinput/bladerfinput.pro b/plugins/samplesource/bladerfinput/bladerfinput.pro index 42543f9fd..8362897b8 100644 --- a/plugins/samplesource/bladerfinput/bladerfinput.pro +++ b/plugins/samplesource/bladerfinput/bladerfinput.pro @@ -17,8 +17,8 @@ DEFINES += USE_SSE4_1=1 QMAKE_CXXFLAGS += -msse4.1 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" +CONFIG(MINGW32):LIBBLADERFSRC = "C:\softs\bladeRF\host\libraries\libbladeRF\include" +CONFIG(MINGW64):LIBBLADERFSRC = "C:\softs\bladeRF\host\libraries\libbladeRF\include" INCLUDEPATH += $$PWD INCLUDEPATH += ../../../exports INCLUDEPATH += ../../../sdrbase diff --git a/plugins/samplesource/hackrfinput/hackrfinput.pro b/plugins/samplesource/hackrfinput/hackrfinput.pro index 89317600b..ea5511dc7 100644 --- a/plugins/samplesource/hackrfinput/hackrfinput.pro +++ b/plugins/samplesource/hackrfinput/hackrfinput.pro @@ -17,8 +17,8 @@ DEFINES += USE_SSE4_1=1 QMAKE_CXXFLAGS += -msse4.1 QMAKE_CXXFLAGS += -std=c++11 -CONFIG(MINGW32):LIBHACKRFSRC = "D:\softs\hackrf\host" -CONFIG(MINGW64):LIBHACKRFSRC = "D:\softs\hackrf\host" +CONFIG(MINGW32):LIBHACKRFSRC = "C:\softs\hackrf\host" +CONFIG(MINGW64):LIBHACKRFSRC = "C:\softs\hackrf\host" INCLUDEPATH += $$PWD INCLUDEPATH += ../../../exports INCLUDEPATH += ../../../sdrbase diff --git a/plugins/samplesource/limesdrinput/limesdrinput.pro b/plugins/samplesource/limesdrinput/limesdrinput.pro index c1fca9b8f..f8fc5db5b 100644 --- a/plugins/samplesource/limesdrinput/limesdrinput.pro +++ b/plugins/samplesource/limesdrinput/limesdrinput.pro @@ -19,8 +19,8 @@ QMAKE_CXXFLAGS += -std=c++11 CONFIG(MINGW32):QMAKE_CXXFLAGS += -std=c++11 -CONFIG(MINGW32):LIBLIMESUITESRC = "D:\softs\LimeSuite" -CONFIG(MINGW64):LIBLIMESUITESRC = "D:\softs\LimeSuite" +CONFIG(MINGW32):LIBLIMESUITESRC = "C:\softs\LimeSuite" +CONFIG(MINGW64):LIBLIMESUITESRC = "C:\softs\LimeSuite" INCLUDEPATH += $$PWD INCLUDEPATH += ../../../exports diff --git a/plugins/samplesource/plutosdrinput/plutosdrinput.pro b/plugins/samplesource/plutosdrinput/plutosdrinput.pro index 906ea2ea5..f18fe1bb4 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinput.pro +++ b/plugins/samplesource/plutosdrinput/plutosdrinput.pro @@ -17,8 +17,8 @@ DEFINES += USE_SSE4_1=1 QMAKE_CXXFLAGS += -msse4.1 QMAKE_CXXFLAGS += -std=c++11 -CONFIG(MINGW32):LIBIIOSRC = "D:\softs\libiio" -CONFIG(MINGW64):LIBIIOSRC = "D:\softs\libiio" +CONFIG(MINGW32):LIBIIOSRC = "C:\softs\libiio" +CONFIG(MINGW64):LIBIIOSRC = "C:\softs\libiio" INCLUDEPATH += $$PWD INCLUDEPATH += ../../../exports diff --git a/plugins/samplesource/rtlsdr/rtlsdr.pro b/plugins/samplesource/rtlsdr/rtlsdr.pro index 8d89e19a7..3e91ff20b 100644 --- a/plugins/samplesource/rtlsdr/rtlsdr.pro +++ b/plugins/samplesource/rtlsdr/rtlsdr.pro @@ -17,8 +17,8 @@ DEFINES += USE_SSE4_1=1 QMAKE_CXXFLAGS += -msse4.1 QMAKE_CXXFLAGS += -std=c++11 -CONFIG(MINGW32):LIBRTLSDRSRC = "D:\softs\librtlsdr" -CONFIG(MINGW64):LIBRTLSDRSRC = "D:\softs\librtlsdr" +CONFIG(MINGW32):LIBRTLSDRSRC = "C:\softs\librtlsdr" +CONFIG(MINGW64):LIBRTLSDRSRC = "C:\softs\librtlsdr" INCLUDEPATH += $$PWD INCLUDEPATH += ../../../exports INCLUDEPATH += ../../../sdrbase diff --git a/sdrangel.windows.pro b/sdrangel.windows.pro index 2d0516235..f0fe75d8e 100644 --- a/sdrangel.windows.pro +++ b/sdrangel.windows.pro @@ -23,7 +23,7 @@ SUBDIRS += libairspyhf SUBDIRS += libbladerf SUBDIRS += libhackrf SUBDIRS += libiio -SUBDIRS += libsqlite3 +#SUBDIRS += libsqlite3 SUBDIRS += liblimesuite SUBDIRS += libperseus SUBDIRS += librtlsdr diff --git a/sdrbase/sdrbase.pro b/sdrbase/sdrbase.pro index fa6d0d6ed..98412c5ea 100644 --- a/sdrbase/sdrbase.pro +++ b/sdrbase/sdrbase.pro @@ -32,11 +32,11 @@ CONFIG(Debug):build_subdir = debug CONFIG(ANDROID):INCLUDEPATH += /opt/softs/boost_1_60_0 -CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_58_0" -CONFIG(MINGW64):INCLUDEPATH += "D:\boost_1_58_0" +CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0" -CONFIG(MINGW32):INCLUDEPATH += "D:\softs\serialDV" -CONFIG(MINGW64):INCLUDEPATH += "D:\softs\serialDV" +CONFIG(MINGW32):INCLUDEPATH += "C:\softs\serialDV" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\serialDV" CONFIG(macx):INCLUDEPATH += "../../../boost_1_64_0" @@ -50,6 +50,7 @@ win32 { } SOURCES += audio/audiodevicemanager.cpp\ + audio/audiocompressor.cpp\ audio/audiofifo.cpp\ audio/audiooutput.cpp\ audio/audioinput.cpp\ @@ -124,6 +125,7 @@ SOURCES += audio/audiodevicemanager.cpp\ mainparser.cpp HEADERS += audio/audiodevicemanager.h\ + audio/audiocompressor.h\ audio/audiofifo.h\ audio/audiooutput.h\ audio/audioinput.h\ diff --git a/sdrgui/sdrgui.pro b/sdrgui/sdrgui.pro index 2d50bb7ec..18dcf1401 100644 --- a/sdrgui/sdrgui.pro +++ b/sdrgui/sdrgui.pro @@ -32,8 +32,8 @@ CONFIG(Debug):build_subdir = debug CONFIG(ANDROID):INCLUDEPATH += /opt/softs/boost_1_60_0 -CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_58_0" -CONFIG(MINGW64):INCLUDEPATH += "D:\boost_1_58_0" +CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0" +CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(macx):INCLUDEPATH += "../../../boost_1_64_0" diff --git a/serialdv/serialdv.pro b/serialdv/serialdv.pro index a79e9c490..e1b141383 100644 --- a/serialdv/serialdv.pro +++ b/serialdv/serialdv.pro @@ -9,8 +9,8 @@ QT += core TEMPLATE = lib TARGET = serialdv -CONFIG(MINGW32):LIBSERIALDVSRC = "D:\softs\serialDV" -CONFIG(MINGW64):LIBSERIALDVSRC = "D:\softs\serialDV" +CONFIG(MINGW32):LIBSERIALDVSRC = "C:\softs\serialDV" +CONFIG(MINGW64):LIBSERIALDVSRC = "C:\softs\serialDV" INCLUDEPATH += $$LIBSERIALDVSRC diff --git a/windows.install.bat b/windows.install.bat index a1774d709..2e3a43a0f 100644 --- a/windows.install.bat +++ b/windows.install.bat @@ -1,8 +1,8 @@ -SET libusbdir="D:\softs\libusb-1.0.20\MinGW32" -SET opencvdir="D:\softs\opencv\build\mw32\install\x86\mingw\bin" -SET libxml2dir="D:\softs\libxml2-2.7.8.win32" -SET libiconvdir="D:\softs\iconv-1.9.2.win32" -SET libzlib1dir="D:\softs\zlib-1.2.5" +SET libusbdir="C:\softs\libusb-1.0.20\MinGW32" +SET opencvdir="C:\softs\opencv\build\mw32\install\x86\mingw\bin" +SET libxml2dir="C:\softs\libxml2-2.7.8.win32" +SET libiconvdir="C:\softs\iconv-1.9.2.win32" +SET libzlib1dir="C:\softs\zlib-1.2.5" copy app\%1\sdrangel.exe %2 copy sdrbase\%1\sdrbase.dll %2