From 782bb8ae4021745ef859a1a07663f3f6bb335b4e Mon Sep 17 00:00:00 2001 From: Edouard Griffiths Date: Wed, 9 Mar 2016 06:39:19 +0100 Subject: [PATCH] Windows build: apply modifications --- plugins/channel/CMakeLists.txt | 2 +- plugins/channel/chanalyzer/chanalyzer.pro | 34 ++++++++++++++++++ .../channel/{am => demodam}/CMakeLists.txt | 0 plugins/channel/{am => demodam}/amdemod.cpp | 0 plugins/channel/{am => demodam}/amdemod.h | 0 .../channel/{am => demodam}/amdemodgui.cpp | 0 plugins/channel/{am => demodam}/amdemodgui.h | 0 plugins/channel/{am => demodam}/amdemodgui.ui | 0 plugins/channel/{am => demodam}/amplugin.cpp | 0 plugins/channel/{am => demodam}/amplugin.h | 0 .../{am/am.pro => demodam/demodam.pro} | 3 -- plugins/samplesource/sdrdaemon/sdrdaemon.pro | 35 +++++++++++++++++++ sdrangel.windows.pro | 4 ++- sdrbase/sdrbase.pro | 2 +- 14 files changed, 74 insertions(+), 6 deletions(-) create mode 100644 plugins/channel/chanalyzer/chanalyzer.pro rename plugins/channel/{am => demodam}/CMakeLists.txt (100%) rename plugins/channel/{am => demodam}/amdemod.cpp (100%) rename plugins/channel/{am => demodam}/amdemod.h (100%) rename plugins/channel/{am => demodam}/amdemodgui.cpp (100%) rename plugins/channel/{am => demodam}/amdemodgui.h (100%) rename plugins/channel/{am => demodam}/amdemodgui.ui (100%) rename plugins/channel/{am => demodam}/amplugin.cpp (100%) rename plugins/channel/{am => demodam}/amplugin.h (100%) rename plugins/channel/{am/am.pro => demodam/demodam.pro} (82%) create mode 100644 plugins/samplesource/sdrdaemon/sdrdaemon.pro diff --git a/plugins/channel/CMakeLists.txt b/plugins/channel/CMakeLists.txt index ff5e30726..a6094a91f 100644 --- a/plugins/channel/CMakeLists.txt +++ b/plugins/channel/CMakeLists.txt @@ -1,7 +1,7 @@ project(demod) add_subdirectory(lora) -add_subdirectory(am) +add_subdirectory(demodam) add_subdirectory(bfm) add_subdirectory(nfm) add_subdirectory(ssb) diff --git a/plugins/channel/chanalyzer/chanalyzer.pro b/plugins/channel/chanalyzer/chanalyzer.pro new file mode 100644 index 000000000..ad50b4d7a --- /dev/null +++ b/plugins/channel/chanalyzer/chanalyzer.pro @@ -0,0 +1,34 @@ +#-------------------------------------------------------- +# +# Pro file for Android and Windows builds with Qt Creator +# +#-------------------------------------------------------- + +TEMPLATE = lib +CONFIG += plugin + +QT += core gui widgets multimedia opengl + +TARGET = chanalyzer +INCLUDEPATH += $$PWD +INCLUDEPATH += ../../../sdrbase + +CONFIG(ANDROID):INCLUDEPATH += /opt/build/Boost-for-Android-Prebuilt/boost_1_53_0/include +CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_58_0" + +CONFIG(Release):build_subdir = release +CONFIG(Debug):build_subdir = debug + +SOURCES += chanalyzer.cpp\ + chanalyzergui.cpp\ + chanalyzerplugin.cpp + +HEADERS += chanalyzer.h\ +chanalyzergui.h\ +chanalyzerplugin.h + +FORMS += chanalyzergui.ui + +LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase + +RESOURCES = ../../../sdrbase/resources/res.qrc diff --git a/plugins/channel/am/CMakeLists.txt b/plugins/channel/demodam/CMakeLists.txt similarity index 100% rename from plugins/channel/am/CMakeLists.txt rename to plugins/channel/demodam/CMakeLists.txt diff --git a/plugins/channel/am/amdemod.cpp b/plugins/channel/demodam/amdemod.cpp similarity index 100% rename from plugins/channel/am/amdemod.cpp rename to plugins/channel/demodam/amdemod.cpp diff --git a/plugins/channel/am/amdemod.h b/plugins/channel/demodam/amdemod.h similarity index 100% rename from plugins/channel/am/amdemod.h rename to plugins/channel/demodam/amdemod.h diff --git a/plugins/channel/am/amdemodgui.cpp b/plugins/channel/demodam/amdemodgui.cpp similarity index 100% rename from plugins/channel/am/amdemodgui.cpp rename to plugins/channel/demodam/amdemodgui.cpp diff --git a/plugins/channel/am/amdemodgui.h b/plugins/channel/demodam/amdemodgui.h similarity index 100% rename from plugins/channel/am/amdemodgui.h rename to plugins/channel/demodam/amdemodgui.h diff --git a/plugins/channel/am/amdemodgui.ui b/plugins/channel/demodam/amdemodgui.ui similarity index 100% rename from plugins/channel/am/amdemodgui.ui rename to plugins/channel/demodam/amdemodgui.ui diff --git a/plugins/channel/am/amplugin.cpp b/plugins/channel/demodam/amplugin.cpp similarity index 100% rename from plugins/channel/am/amplugin.cpp rename to plugins/channel/demodam/amplugin.cpp diff --git a/plugins/channel/am/amplugin.h b/plugins/channel/demodam/amplugin.h similarity index 100% rename from plugins/channel/am/amplugin.h rename to plugins/channel/demodam/amplugin.h diff --git a/plugins/channel/am/am.pro b/plugins/channel/demodam/demodam.pro similarity index 82% rename from plugins/channel/am/am.pro rename to plugins/channel/demodam/demodam.pro index c0d6066c7..8cf7a09c0 100644 --- a/plugins/channel/am/am.pro +++ b/plugins/channel/demodam/demodam.pro @@ -29,6 +29,3 @@ FORMS += amdemodgui.ui LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase RESOURCES = ../../../sdrbase/resources/res.qrc - -target.path = ../../../dist/$${build_subdir}/plugins/channel -CONFIG(MINGW32):INSTALLS += target diff --git a/plugins/samplesource/sdrdaemon/sdrdaemon.pro b/plugins/samplesource/sdrdaemon/sdrdaemon.pro new file mode 100644 index 000000000..96ed8ac81 --- /dev/null +++ b/plugins/samplesource/sdrdaemon/sdrdaemon.pro @@ -0,0 +1,35 @@ +#-------------------------------------------------------- +# +# Pro file for Android and Windows builds with Qt Creator +# +#-------------------------------------------------------- + +TEMPLATE = lib +CONFIG += plugin + +QT += core gui widgets multimedia network + +TARGET = inputsdrdaemon +INCLUDEPATH += $$PWD +INCLUDEPATH += ../../../sdrbase + +CONFIG(Release):build_subdir = release +CONFIG(Debug):build_subdir = debug + +SOURCES += sdrdaemonbuffer.cpp\ +sdrdaemongui.cpp\ +sdrdaemoninput.cpp\ +sdrdaemonplugin.cpp\ +sdrdaemonudphandler.cpp + +HEADERS += sdrdaemonbuffer.h\ +sdrdaemongui.h\ +sdrdaemoninput.h\ +sdrdaemonplugin.h\ +sdrdaemonudphandler.h + +FORMS += sdrdaemongui.ui + +LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase + +RESOURCES = ../../../sdrbase/resources/res.qrc diff --git a/sdrangel.windows.pro b/sdrangel.windows.pro index 49cb2f6a5..458827a29 100644 --- a/sdrangel.windows.pro +++ b/sdrangel.windows.pro @@ -7,7 +7,9 @@ TEMPLATE = subdirs SUBDIRS = sdrbase SUBDIRS += plugins/samplesource/filesource -SUBDIRS += plugins/channel/am +SUBDIRS += plugins/samplesource/sdrdaemon +SUBDIRS += plugins/channel/demodam +SUBDIRS += plugins/channel/chanalyzer # Main app must be last CONFIG += ordered diff --git a/sdrbase/sdrbase.pro b/sdrbase/sdrbase.pro index 301bf7662..50455f0bc 100644 --- a/sdrbase/sdrbase.pro +++ b/sdrbase/sdrbase.pro @@ -14,7 +14,7 @@ INCLUDEPATH += $$PWD DEFINES += USE_KISSFFT=1 CONFIG(ANDROID):INCLUDEPATH += /opt/build/Boost-for-Android-Prebuilt/boost_1_53_0/include -CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_58_0" +CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_55_0" SOURCES += mainwindow.cpp\ audio/audiodeviceinfo.cpp\