From 0e75cc37099b6712de35bf385f0824195374b1d7 Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 14 Dec 2018 17:49:06 +0100 Subject: [PATCH] Wndows builds: removed reference to now obsolete MinGW64 toolchain --- plugins/channelrx/chanalyzer/chanalyzer.pro | 1 - plugins/channelrx/demodatv/demodatv.pro | 1 - plugins/channelrx/demodbfm/demodbfm.pro | 1 - plugins/channelrx/demoddsd/demoddsd.pro | 3 --- plugins/channeltx/modatv/modatv.pro | 2 -- plugins/samplesink/bladerf1output/bladerf1output.pro | 5 ++--- plugins/samplesink/bladerf2output/bladerf2output.pro | 4 ++-- plugins/samplesink/hackrfoutput/hackrfoutput.pro | 1 - plugins/samplesink/limesdroutput/limesdroutput.pro | 5 ++--- plugins/samplesink/plutosdroutput/plutosdroutput.pro | 4 ++-- plugins/samplesink/sdrdaemonsink/sdrdaemonsink.pro | 2 -- plugins/samplesource/airspy/airspy.pro | 1 - plugins/samplesource/airspyhf/airspyhf.pro | 1 - plugins/samplesource/bladerf1input/bladerf1input.pro | 4 ++-- plugins/samplesource/bladerf2input/bladerf2input.pro | 4 ++-- plugins/samplesource/hackrfinput/hackrfinput.pro | 1 - plugins/samplesource/limesdrinput/limesdrinput.pro | 5 ++--- plugins/samplesource/plutosdrinput/plutosdrinput.pro | 4 ++-- plugins/samplesource/rtlsdr/rtlsdr.pro | 1 - plugins/samplesource/sdrdaemonsource/sdrdaemonsource.pro | 2 -- 20 files changed, 16 insertions(+), 36 deletions(-) diff --git a/plugins/channelrx/chanalyzer/chanalyzer.pro b/plugins/channelrx/chanalyzer/chanalyzer.pro index 14377d5b9..4a3ea7aa0 100644 --- a/plugins/channelrx/chanalyzer/chanalyzer.pro +++ b/plugins/channelrx/chanalyzer/chanalyzer.pro @@ -24,7 +24,6 @@ INCLUDEPATH += ../../../sdrgui CONFIG(ANDROID):INCLUDEPATH += /opt/softs/boost_1_60_0 CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0" -CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_64_0" diff --git a/plugins/channelrx/demodatv/demodatv.pro b/plugins/channelrx/demodatv/demodatv.pro index aa5fce3d4..2f88bacca 100644 --- a/plugins/channelrx/demodatv/demodatv.pro +++ b/plugins/channelrx/demodatv/demodatv.pro @@ -26,7 +26,6 @@ CONFIG(Release):build_subdir = release CONFIG(Debug):build_subdir = debug CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0" -CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_64_0" diff --git a/plugins/channelrx/demodbfm/demodbfm.pro b/plugins/channelrx/demodbfm/demodbfm.pro index efb129f79..200e2a0fa 100644 --- a/plugins/channelrx/demodbfm/demodbfm.pro +++ b/plugins/channelrx/demodbfm/demodbfm.pro @@ -25,7 +25,6 @@ INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client CONFIG(ANDROID):INCLUDEPATH += /opt/softs/boost_1_60_0 CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0" -CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_64_0" diff --git a/plugins/channelrx/demoddsd/demoddsd.pro b/plugins/channelrx/demoddsd/demoddsd.pro index d9e085168..81430f5c4 100644 --- a/plugins/channelrx/demoddsd/demoddsd.pro +++ b/plugins/channelrx/demoddsd/demoddsd.pro @@ -18,17 +18,14 @@ QMAKE_CXXFLAGS += -msse4.1 QMAKE_CXXFLAGS += -std=c++11 CONFIG(MINGW32):LIBDSDCCSRC = "C:\softs\dsdcc" -CONFIG(MINGW64):LIBDSDCCSRC = "C:\softs\dsdcc" CONFIG(MSVC):LIBDSDCCSRC = "C:\softs\dsdcc" CONFIG(macx):LIBDSDCCSRC = "../../../../deps/dsdcc" CONFIG(MINGW32):LIBMBELIBSRC = "C:\softs\mbelib" -CONFIG(MINGW64):LIBMBELIBSRC = "C:\softs\mbelib" CONFIG(MSVC):LIBMBELIBSRC = "C:\softs\mbelib" CONFIG(macx):LIBMBELIBSRC = "../../../../deps/mbelib" CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0" -CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_64_0" diff --git a/plugins/channeltx/modatv/modatv.pro b/plugins/channeltx/modatv/modatv.pro index 04adb5fe7..ee2b32bfc 100644 --- a/plugins/channeltx/modatv/modatv.pro +++ b/plugins/channeltx/modatv/modatv.pro @@ -26,7 +26,6 @@ CONFIG(Release):build_subdir = release CONFIG(Debug):build_subdir = debug CONFIG(MINGW32):INCLUDEPATH += "D:\softs\opencv\build\include" -CONFIG(MINGW64):INCLUDEPATH += "D:\softs\opencv\build\include" CONFIG(macx):INCLUDEPATH += "/opt/local/include" SOURCES += atvmod.cpp\ @@ -45,7 +44,6 @@ LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui CONFIG(MINGW32):LIBS += -LD:\softs\opencv\build\mw32\install\x86\mingw\bin -llibopencv_core2413 -llibopencv_highgui2413 -llibopencv_imgproc2413 -CONFIG(MINGW64):LIBS += -LD:\softs\opencv\build\mw64\install\x64\mingw\bin -llibopencv_core2413 -llibopencv_highgui2413 -llibopencv_imgproc2413 CONFIG(macx):LIBS += -L/opt/local/lib -lopencv_core -lopencv_highgui -lopencv_imgcodecs -lopencv_imgproc -lopencv_video -lopencv_videoio RESOURCES = ../../../sdrgui/resources/res.qrc diff --git a/plugins/samplesink/bladerf1output/bladerf1output.pro b/plugins/samplesink/bladerf1output/bladerf1output.pro index a777d371e..edda3b0bb 100644 --- a/plugins/samplesink/bladerf1output/bladerf1output.pro +++ b/plugins/samplesink/bladerf1output/bladerf1output.pro @@ -18,7 +18,6 @@ QMAKE_CXXFLAGS += -msse4.1 QMAKE_CXXFLAGS += -std=c++11 CONFIG(MINGW32):LIBBLADERF = "C:\Programs\bladeRF" -CONFIG(MINGW64):LIBBLADERF = "C:\Programs\bladeRF" INCLUDEPATH += $$PWD INCLUDEPATH += ../../../exports INCLUDEPATH += ../../../sdrbase @@ -26,7 +25,7 @@ INCLUDEPATH += ../../../sdrgui INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client INCLUDEPATH += ../../../devices -MINGW32 || MINGW64 { +MINGW32 { LIBBLADERF = "C:\Programs\bladeRF" INCLUDEPATH += $$LIBBLADERF/include } @@ -57,7 +56,7 @@ LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui LIBS += -L../../../swagger/$${build_subdir} -lswagger LIBS += -L../../../devices/$${build_subdir} -ldevices -MINGW32 || MINGW64 { +MINGW32 { LIBS += -L$$LIBBLADERF/lib -lbladeRF } diff --git a/plugins/samplesink/bladerf2output/bladerf2output.pro b/plugins/samplesink/bladerf2output/bladerf2output.pro index 74f0859a2..8fc7ce06e 100644 --- a/plugins/samplesink/bladerf2output/bladerf2output.pro +++ b/plugins/samplesink/bladerf2output/bladerf2output.pro @@ -24,7 +24,7 @@ INCLUDEPATH += ../../../sdrgui INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client INCLUDEPATH += ../../../devices -MINGW32 || MINGW64 { +MINGW32 { LIBBLADERF = "C:\Programs\bladeRF" INCLUDEPATH += $$LIBBLADERF/include } @@ -55,7 +55,7 @@ LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui LIBS += -L../../../swagger/$${build_subdir} -lswagger LIBS += -L../../../devices/$${build_subdir} -ldevices -MINGW32 || MINGW64 { +MINGW32 { LIBS += -L$$LIBBLADERF/lib -lbladeRF } diff --git a/plugins/samplesink/hackrfoutput/hackrfoutput.pro b/plugins/samplesink/hackrfoutput/hackrfoutput.pro index f8c1f1113..39047a00e 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutput.pro +++ b/plugins/samplesink/hackrfoutput/hackrfoutput.pro @@ -18,7 +18,6 @@ QMAKE_CXXFLAGS += -msse4.1 QMAKE_CXXFLAGS += -std=c++11 CONFIG(MINGW32):LIBHACKRFSRC = "C:\softs\hackrf\host" -CONFIG(MINGW64):LIBHACKRFSRC = "C:\softs\hackrf\host" CONFIG(MSVC):LIBHACKRFSRC = "C:\softs\hackrf\host" INCLUDEPATH += $$PWD diff --git a/plugins/samplesink/limesdroutput/limesdroutput.pro b/plugins/samplesink/limesdroutput/limesdroutput.pro index 8f4f60b51..638a66363 100644 --- a/plugins/samplesink/limesdroutput/limesdroutput.pro +++ b/plugins/samplesink/limesdroutput/limesdroutput.pro @@ -18,7 +18,6 @@ QMAKE_CXXFLAGS += -msse4.1 QMAKE_CXXFLAGS += -std=c++11 CONFIG(MINGW32):LIBLIMESUITESRC = "C:\softs\LimeSuite" -CONFIG(MINGW64):LIBLIMESUITESRC = "C:\softs\LimeSuite" INCLUDEPATH += $$PWD INCLUDEPATH += ../../../exports @@ -27,7 +26,7 @@ INCLUDEPATH += ../../../sdrgui INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client INCLUDEPATH += ../../../devices -MINGW32 || MINGW64 || macx { +MINGW32 || macx { INCLUDEPATH += ../../../liblimesuite/srcmw INCLUDEPATH += $$LIBLIMESUITESRC/src INCLUDEPATH += $$LIBLIMESUITESRC/src/ADF4002 @@ -67,7 +66,7 @@ LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui LIBS += -L../../../swagger/$${build_subdir} -lswagger LIBS += -L../../../devices/$${build_subdir} -ldevices -MINGW32 || MINGW64 || macx { +MINGW32 || macx { LIBS += -L../../../liblimesuite/$${build_subdir} -lliblimesuite } MSVC { diff --git a/plugins/samplesink/plutosdroutput/plutosdroutput.pro b/plugins/samplesink/plutosdroutput/plutosdroutput.pro index 1cee810e4..dd71cdce8 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutput.pro +++ b/plugins/samplesink/plutosdroutput/plutosdroutput.pro @@ -24,7 +24,7 @@ INCLUDEPATH += ../../../sdrgui INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client INCLUDEPATH += ../../../devices -MINGW32 || MINGW64 { +MINGW32 { LIBIIOSRC = "C:\softs\libiio" INCLUDEPATH += ../../../libiio/includemw INCLUDEPATH += $$LIBIIOSRC @@ -56,7 +56,7 @@ LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui LIBS += -L../../../swagger/$${build_subdir} -lswagger LIBS += -L../../../devices/$${build_subdir} -ldevices -MINGW32 || MINGW64 { +MINGW32 { LIBS += -L../../../libiio/$${build_subdir} -llibiio } diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsink.pro b/plugins/samplesink/sdrdaemonsink/sdrdaemonsink.pro index b70d7a122..a35d3ca78 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsink.pro +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsink.pro @@ -12,7 +12,6 @@ QT += core gui widgets multimedia network opengl TARGET = outputsdrdaemonsink CONFIG(MINGW32):LIBCM256CCSRC = "C:\softs\cm256cc" -CONFIG(MINGW64):LIBCM256CCSRC = "C:\softs\cm256cc" CONFIG(MSVC):LIBCM256CCSRC = "C:\softs\cm256cc" CONFIG(macx):LIBCM256CCSRC = "../../../../deps/cm256cc" @@ -36,7 +35,6 @@ CONFIG(Release):build_subdir = release CONFIG(Debug):build_subdir = debug CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0" -CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(macx):INCLUDEPATH += "../../../boost_1_64_0" diff --git a/plugins/samplesource/airspy/airspy.pro b/plugins/samplesource/airspy/airspy.pro index 600b51672..711d6624b 100644 --- a/plugins/samplesource/airspy/airspy.pro +++ b/plugins/samplesource/airspy/airspy.pro @@ -12,7 +12,6 @@ QT += core gui widgets multimedia opengl TARGET = inputairspy CONFIG(MINGW32):LIBAIRSPYSRC = "C:\softs\libairspy" -CONFIG(MINGW64):LIBAIRSPYSRC = "C:\softs\libairspy" CONFIG(MSVC):LIBAIRSPYSRC = "C:\softs\libairspy" INCLUDEPATH += $$PWD diff --git a/plugins/samplesource/airspyhf/airspyhf.pro b/plugins/samplesource/airspyhf/airspyhf.pro index 9c611a347..114d49f38 100644 --- a/plugins/samplesource/airspyhf/airspyhf.pro +++ b/plugins/samplesource/airspyhf/airspyhf.pro @@ -12,7 +12,6 @@ QT += core gui widgets multimedia opengl TARGET = inputairspyhf CONFIG(MINGW32):LIBAIRSPYHFSRC = "C:\softs\airspyhf" -CONFIG(MINGW64):LIBAIRSPYHFSRC = "C:\softs\airspyhf" CONFIG(MSVC):LIBAIRSPYHFSRC = "C:\softs\airspyhf" INCLUDEPATH += $$PWD diff --git a/plugins/samplesource/bladerf1input/bladerf1input.pro b/plugins/samplesource/bladerf1input/bladerf1input.pro index 8bfda4fb1..304174684 100644 --- a/plugins/samplesource/bladerf1input/bladerf1input.pro +++ b/plugins/samplesource/bladerf1input/bladerf1input.pro @@ -24,7 +24,7 @@ INCLUDEPATH += ../../../sdrgui INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client INCLUDEPATH += ../../../devices -MINGW32 || MINGW64 { +MINGW32 { LIBBLADERF = "C:\Programs\bladeRF" INCLUDEPATH += $$LIBBLADERF/include } @@ -55,7 +55,7 @@ LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui LIBS += -L../../../swagger/$${build_subdir} -lswagger LIBS += -L../../../devices/$${build_subdir} -ldevices -MINGW32 || MINGW64 { +MINGW32 { LIBS += -L$$LIBBLADERF/lib -lbladeRF } diff --git a/plugins/samplesource/bladerf2input/bladerf2input.pro b/plugins/samplesource/bladerf2input/bladerf2input.pro index fe47be190..de7b3dcd7 100644 --- a/plugins/samplesource/bladerf2input/bladerf2input.pro +++ b/plugins/samplesource/bladerf2input/bladerf2input.pro @@ -24,7 +24,7 @@ INCLUDEPATH += ../../../sdrgui INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client INCLUDEPATH += ../../../devices -MINGW32 || MINGW64 { +MINGW32 { LIBBLADERF = "C:\Programs\bladeRF" INCLUDEPATH += $$LIBBLADERF/include } @@ -55,7 +55,7 @@ LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui LIBS += -L../../../swagger/$${build_subdir} -lswagger LIBS += -L../../../devices/$${build_subdir} -ldevices -MINGW32 || MINGW64 { +MINGW32 { LIBS += -L$$LIBBLADERF/lib -lbladeRF } diff --git a/plugins/samplesource/hackrfinput/hackrfinput.pro b/plugins/samplesource/hackrfinput/hackrfinput.pro index 573d81165..e95e782d1 100644 --- a/plugins/samplesource/hackrfinput/hackrfinput.pro +++ b/plugins/samplesource/hackrfinput/hackrfinput.pro @@ -18,7 +18,6 @@ QMAKE_CXXFLAGS += -msse4.1 QMAKE_CXXFLAGS += -std=c++11 CONFIG(MINGW32):LIBHACKRFSRC = "C:\softs\hackrf\host" -CONFIG(MINGW64):LIBHACKRFSRC = "C:\softs\hackrf\host" CONFIG(MSVC):LIBHACKRFSRC = "C:\softs\hackrf\host" INCLUDEPATH += $$PWD diff --git a/plugins/samplesource/limesdrinput/limesdrinput.pro b/plugins/samplesource/limesdrinput/limesdrinput.pro index 8c6ec1fe0..e3aec508c 100644 --- a/plugins/samplesource/limesdrinput/limesdrinput.pro +++ b/plugins/samplesource/limesdrinput/limesdrinput.pro @@ -20,7 +20,6 @@ QMAKE_CXXFLAGS += -std=c++11 CONFIG(MINGW32):QMAKE_CXXFLAGS += -std=c++11 CONFIG(MINGW32):LIBLIMESUITESRC = "C:\softs\LimeSuite" -CONFIG(MINGW64):LIBLIMESUITESRC = "C:\softs\LimeSuite" INCLUDEPATH += $$PWD INCLUDEPATH += ../../../exports @@ -29,7 +28,7 @@ INCLUDEPATH += ../../../sdrgui INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client INCLUDEPATH += ../../../devices -MINGW32 || MINGW64 || macx { +MINGW32 || macx { INCLUDEPATH += ../../../liblimesuite/srcmw INCLUDEPATH += $$LIBLIMESUITESRC/src INCLUDEPATH += $$LIBLIMESUITESRC/src/ADF4002 @@ -68,7 +67,7 @@ LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui LIBS += -L../../../swagger/$${build_subdir} -lswagger LIBS += -L../../../devices/$${build_subdir} -ldevices -MINGW32 || MINGW64 || macx { +MINGW32 || macx { LIBS += -L../../../liblimesuite/$${build_subdir} -lliblimesuite } MSVC { diff --git a/plugins/samplesource/plutosdrinput/plutosdrinput.pro b/plugins/samplesource/plutosdrinput/plutosdrinput.pro index 74999834f..148725397 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinput.pro +++ b/plugins/samplesource/plutosdrinput/plutosdrinput.pro @@ -24,7 +24,7 @@ INCLUDEPATH += ../../../sdrgui INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client INCLUDEPATH += ../../../devices -MINGW32 || MINGW64 { +MINGW32 { LIBIIOSRC = "C:\softs\libiio" INCLUDEPATH += ../../../libiio/includemw INCLUDEPATH += $$LIBIIOSRC @@ -56,7 +56,7 @@ LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui LIBS += -L../../../swagger/$${build_subdir} -lswagger LIBS += -L../../../devices/$${build_subdir} -ldevices -MINGW32 || MINGW64 { +MINGW32 { LIBS += -L../../../libiio/$${build_subdir} -llibiio } diff --git a/plugins/samplesource/rtlsdr/rtlsdr.pro b/plugins/samplesource/rtlsdr/rtlsdr.pro index f88833f4a..0efdb6a0b 100644 --- a/plugins/samplesource/rtlsdr/rtlsdr.pro +++ b/plugins/samplesource/rtlsdr/rtlsdr.pro @@ -18,7 +18,6 @@ QMAKE_CXXFLAGS += -msse4.1 QMAKE_CXXFLAGS += -std=c++11 CONFIG(MINGW32):LIBRTLSDRSRC = "C:\softs\librtlsdr" -CONFIG(MINGW64):LIBRTLSDRSRC = "C:\softs\librtlsdr" CONFIG(MSVC):LIBRTLSDRSRC = "C:\softs\librtlsdr" INCLUDEPATH += $$PWD diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsource.pro b/plugins/samplesource/sdrdaemonsource/sdrdaemonsource.pro index b80841071..b6a5c7988 100644 --- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsource.pro +++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsource.pro @@ -12,7 +12,6 @@ QT += core gui widgets multimedia network opengl TARGET = inputsdrdaemonsource CONFIG(MINGW32):LIBCM256CCSRC = "C:\softs\cm256cc" -CONFIG(MINGW64):LIBCM256CCSRC = "C:\softs\cm256cc" CONFIG(MSVC):LIBCM256CCSRC = "C:\softs\cm256cc" CONFIG(macx):LIBCM256CCSRC = "../../../../deps/cm256cc" @@ -36,7 +35,6 @@ CONFIG(Release):build_subdir = release CONFIG(Debug):build_subdir = debug CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0" -CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(macx):INCLUDEPATH += "../../../boost_1_64_0"