diff options
| author | Robert Adam <dev@robert-adam.de> | 2021-11-10 10:52:21 +0300 |
|---|---|---|
| committer | Robert Adam <dev@robert-adam.de> | 2021-11-10 10:52:21 +0300 |
| commit | d25bfd02fc5911a9bb07690ea46098e86af1bf7b (patch) | |
| tree | 23302fbf07b17b20e39cd4077b42351a1bebc9b9 | |
| parent | 1fa6909d6ec432c9669f90d2d30d6055c577fe13 (diff) | |
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
| -rw-r--r-- | src/mumble/PluginConfig.cpp | 1 | ||||
| -rw-r--r-- | 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 <cstdint> #include <memory> #include <vector> |