From 21ba11d90e7343c80cacfebd89dc2f30e796c19d Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 1 Nov 2017 23:00:00 +0100 Subject: [PATCH] Moved plugin classes back to sdrbase --- sdrbase/CMakeLists.txt | 4 ++++ {sdrgui => sdrbase}/plugin/pluginapi.cpp | 0 {sdrgui => sdrbase}/plugin/pluginapi.h | 0 {sdrgui => sdrbase}/plugin/pluginmanager.cpp | 0 {sdrgui => sdrbase}/plugin/pluginmanager.h | 0 sdrgui/CMakeLists.txt | 6 ------ 6 files changed, 4 insertions(+), 6 deletions(-) rename {sdrgui => sdrbase}/plugin/pluginapi.cpp (100%) rename {sdrgui => sdrbase}/plugin/pluginapi.h (100%) rename {sdrgui => sdrbase}/plugin/pluginmanager.cpp (100%) rename {sdrgui => sdrbase}/plugin/pluginmanager.h (100%) diff --git a/sdrbase/CMakeLists.txt b/sdrbase/CMakeLists.txt index 4bc2edf0a..3b5ce6b70 100644 --- a/sdrbase/CMakeLists.txt +++ b/sdrbase/CMakeLists.txt @@ -62,6 +62,8 @@ set(sdrbase_SOURCES #util/spinlock.cpp plugin/plugininterface.cpp + plugin/pluginapi.cpp + plugin/pluginmanager.cpp ) set(sdrbase_HEADERS @@ -129,6 +131,8 @@ set(sdrbase_HEADERS plugin/plugininstancegui.h plugin/plugininterface.h + plugin/pluginapi.h + plugin/pluginmanager.h settings/preferences.h settings/preset.h diff --git a/sdrgui/plugin/pluginapi.cpp b/sdrbase/plugin/pluginapi.cpp similarity index 100% rename from sdrgui/plugin/pluginapi.cpp rename to sdrbase/plugin/pluginapi.cpp diff --git a/sdrgui/plugin/pluginapi.h b/sdrbase/plugin/pluginapi.h similarity index 100% rename from sdrgui/plugin/pluginapi.h rename to sdrbase/plugin/pluginapi.h diff --git a/sdrgui/plugin/pluginmanager.cpp b/sdrbase/plugin/pluginmanager.cpp similarity index 100% rename from sdrgui/plugin/pluginmanager.cpp rename to sdrbase/plugin/pluginmanager.cpp diff --git a/sdrgui/plugin/pluginmanager.h b/sdrbase/plugin/pluginmanager.h similarity index 100% rename from sdrgui/plugin/pluginmanager.h rename to sdrbase/plugin/pluginmanager.h diff --git a/sdrgui/CMakeLists.txt b/sdrgui/CMakeLists.txt index caceba76b..a7bfc1b8f 100644 --- a/sdrgui/CMakeLists.txt +++ b/sdrgui/CMakeLists.txt @@ -44,9 +44,6 @@ set(sdrgui_SOURCES dsp/spectrumscopengcombovis.cpp device/deviceuiset.cpp - - plugin/pluginapi.cpp - plugin/pluginmanager.cpp ) set(sdrgui_HEADERS @@ -93,9 +90,6 @@ set(sdrgui_HEADERS dsp/spectrumscopengcombovis.h device/deviceuiset.h - - plugin/pluginapi.h - plugin/pluginmanager.h ) set(sdrgui_SOURCES