From d25bfd02fc5911a9bb07690ea46098e86af1bf7b Mon Sep 17 00:00:00 2001 From: Robert Adam Date: Wed, 10 Nov 2021 08:52:21 +0100 Subject: [PATCH] BUILD(client): Fix compile errors without manual plugin When excluding the manual plugin from the build (-Dmanual-plugin=OFF), the compilation would fail due to the ManualPlugin.h header being included in certain files nonetheless. As it turns out the include was superfluous in the PluginConfig.cpp file and in PluginManager.cpp the include is now shielded by a proper ifdef-guard. Fixes #5304 --- src/mumble/PluginConfig.cpp | 1 - src/mumble/PluginManager.cpp | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mumble/PluginConfig.cpp b/src/mumble/PluginConfig.cpp index 91d8c4e8e..99387354b 100644 --- a/src/mumble/PluginConfig.cpp +++ b/src/mumble/PluginConfig.cpp @@ -7,7 +7,6 @@ #include "Log.h" #include "MainWindow.h" -#include "ManualPlugin.h" #include "Message.h" #include "MumbleApplication.h" #include "PluginInstaller.h" diff --git a/src/mumble/PluginManager.cpp b/src/mumble/PluginManager.cpp index b016be79e..8ab8859ad 100644 --- a/src/mumble/PluginManager.cpp +++ b/src/mumble/PluginManager.cpp @@ -22,13 +22,16 @@ #include "API.h" #include "Log.h" -#include "ManualPlugin.h" #include "PluginInstaller.h" #include "PluginUpdater.h" #include "ProcessResolver.h" #include "ServerHandler.h" #include "Global.h" +#ifdef USE_MANUAL_PLUGIN +# include "ManualPlugin.h" +#endif + #include #include #include